diff options
author | LRN <lrn1986@gmail.com> | 2014-01-27 07:03:27 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2014-01-27 07:03:27 +0000 |
commit | 1f3cc317af5f581e9d4869227b2205d797c87e55 (patch) | |
tree | 15ad3817d0ce5819ebea83a4b924ca48a098a244 /configure.ac | |
parent | f1ca38573f22205e28ac482efebe463696c9c2c7 (diff) | |
download | gnunet-1f3cc317af5f581e9d4869227b2205d797c87e55.tar.gz gnunet-1f3cc317af5f581e9d4869227b2205d797c87e55.zip |
Revert "use -Wl on -no-undefined as it is a linker option:"
This reverts commit 57b1d0dc7f4aa49b5dc0c18225f51951119bd58c.
Remove redundant -no-undefined, make sure only the one that gets
into Makefiles directly remains, remove -Wl prefix from it.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 29c65c44a..e1bfd29ef 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -138,7 +138,6 @@ linux*) | |||
138 | AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system]) | 138 | AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system]) |
139 | AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) | 139 | AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) |
140 | AC_CHECK_LIB(intl, gettext) | 140 | AC_CHECK_LIB(intl, gettext) |
141 | LDFLAGS="$LDFLAGS -Wl,-no-undefined" | ||
142 | CFLAGS="-mms-bitfields $CFLAGS" | 141 | CFLAGS="-mms-bitfields $CFLAGS" |
143 | build_target="cygwin" | 142 | build_target="cygwin" |
144 | LIBPREFIX=lib | 143 | LIBPREFIX=lib |
@@ -151,7 +150,7 @@ linux*) | |||
151 | AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) | 150 | AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) |
152 | AC_DEFINE_UNQUOTED(_WIN32,1,[This is a Windows system]) | 151 | AC_DEFINE_UNQUOTED(_WIN32,1,[This is a Windows system]) |
153 | AC_CHECK_LIB(intl, gettext) | 152 | AC_CHECK_LIB(intl, gettext) |
154 | LDFLAGS="$LDFLAGS -Wl,-no-undefined -Wl,--export-all-symbols" | 153 | LDFLAGS="$LDFLAGS -Wl,--export-all-symbols" |
155 | LIBS="$LIBS -lws2_32 -lplibc -lgnurx -lole32" | 154 | LIBS="$LIBS -lws2_32 -lplibc -lgnurx -lole32" |
156 | CFLAGS="-mms-bitfields $CFLAGS" | 155 | CFLAGS="-mms-bitfields $CFLAGS" |
157 | CPPFLAGS="-D_WIN32_WINNT=0x0501 -DHAVE_STAT64=1 -D__USE_MINGW_ANSI_STDIO=1 $CPPFLAGS" | 156 | CPPFLAGS="-D_WIN32_WINNT=0x0501 -DHAVE_STAT64=1 -D__USE_MINGW_ANSI_STDIO=1 $CPPFLAGS" |
@@ -933,8 +932,8 @@ then | |||
933 | AC_LIB_APPENDTOVAR([CPPFLAGS], [$GN_INTLINCL]) | 932 | AC_LIB_APPENDTOVAR([CPPFLAGS], [$GN_INTLINCL]) |
934 | fi | 933 | fi |
935 | 934 | ||
936 | GN_LIB_LDFLAGS="-export-dynamic -Wl,-no-undefined" | 935 | GN_LIB_LDFLAGS="-export-dynamic -no-undefined" |
937 | GN_PLUGIN_LDFLAGS="-export-dynamic -avoid-version -module -Wl,-no-undefined" | 936 | GN_PLUGIN_LDFLAGS="-export-dynamic -avoid-version -module -no-undefined" |
938 | 937 | ||
939 | AC_SUBST(GN_LIB_LDFLAGS) | 938 | AC_SUBST(GN_LIB_LDFLAGS) |
940 | AC_SUBST(GN_PLUGIN_LDFLAGS) | 939 | AC_SUBST(GN_PLUGIN_LDFLAGS) |