1
0
mirror of https://git.savannah.gnu.org/git/gnulib.git synced 2025-08-10 04:43:00 +03:00

relocatable-prog-wrapper: Fix breakage on Cygwin.

* modules/relocatable-prog-wrapper (Files): Add lib/stat.c, lib/lstat.c.
(Depends-on): Remove intprops.
* lib/relocwrapper.c: Update dependency tree.
(strerror): Undefine.
* build-aux/install-reloc (func_create_wrapper): Do not compile
strerror.c and strerror-override.c. Erase stat.o and lstat.o.
This commit is contained in:
Bruno Haible
2016-11-19 14:03:07 +01:00
parent 33a0497171
commit d91ad340b4
4 changed files with 30 additions and 12 deletions

View File

@@ -1,3 +1,13 @@
2016-11-19 Bruno Haible <bruno@clisp.org>
relocatable-prog-wrapper: Fix breakage on Cygwin.
* modules/relocatable-prog-wrapper (Files): Add lib/stat.c, lib/lstat.c.
(Depends-on): Remove intprops.
* lib/relocwrapper.c: Update dependency tree.
(strerror): Undefine.
* build-aux/install-reloc (func_create_wrapper): Do not compile
strerror.c and strerror-override.c. Erase stat.o and lstat.o.
2016-11-19 Bruno Haible <bruno@clisp.org>
strerror: Make it compile in C++ mode.

View File

@@ -232,15 +232,13 @@ func_create_wrapper ()
"$srcdir"/areadlink.c \
"$srcdir"/careadlinkat.c \
"$srcdir"/allocator.c \
"$srcdir"/strerror-override.c \
"$srcdir"/stat.c \
"$srcdir"/lstat.c \
"$srcdir"/readlink.c \
"$srcdir"/stat.c \
"$srcdir"/canonicalize-lgpl.c \
"$srcdir"/malloca.c \
"$srcdir"/lstat.c \
"$srcdir"/relocatable.c \
"$srcdir"/setenv.c \
"$srcdir"/strerror.c \
"$srcdir"/c-ctype.c \
-o "$destprog.wrapper$exeext"
rc=$?
@@ -253,11 +251,12 @@ func_create_wrapper ()
careadlinkat.o \
allocator.o \
readlink.o \
stat.o \
canonicalize-lgpl.o \
malloca.o \
lstat.o \
relocatable.o \
setenv.o \
strerror.o \
c-ctype.o
test $rc = 0 || exit $?
# Clean up debugging information left over by the native C compiler on MacOS X.

View File

@@ -19,16 +19,23 @@
relocwrapper
-> progname
-> progreloc
-> areadlink
-> careadlinkat
-> areadlink
-> careadlinkat
-> allocator
-> readlink
-> canonicalize-lgpl
-> malloca
-> readlink
-> readlink
-> stat
-> dosname
-> pathmax
-> verify
-> canonicalize-lgpl
-> malloca
-> lstat
-> readlink
-> relocatable
-> setenv
-> malloca
-> fprintf-posix [ignore, cut dependency tree here]
-> strerror [ignore, cut dependency tree here]
-> c-ctype
Macros that need to be set while compiling this file:
@@ -60,6 +67,7 @@
/* Use the system functions, not the gnulib overrides in this file. */
#undef fprintf
#undef strerror
/* Return a copy of the filename, with an extra ".bin" at the end.
More generally, it replaces "${EXEEXT}" at the end with ".bin${EXEEXT}". */

View File

@@ -15,9 +15,11 @@ lib/careadlinkat.c
lib/allocator.h
lib/allocator.c
lib/readlink.c
lib/stat.c
lib/canonicalize-lgpl.c
lib/malloca.h
lib/malloca.c
lib/lstat.c
lib/relocatable.h
lib/relocatable.c
lib/setenv.c
@@ -43,7 +45,6 @@ stdint
stdlib
unistd
environ
intprops
string
verify