diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-04-24 16:35:05 -0400 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2018-04-30 12:14:07 -0400 |
| commit | 9d12af9ef8783987ab3fce8e5418165969697978 (patch) | |
| tree | 2e635d931b4b4ccb517aee2ce7fcc684a914ed2a | |
| parent | fe9457dedd47edb3004a292cd0a05052e915f166 (diff) | |
| download | glib-9d12af9ef8783987ab3fce8e5418165969697978.tar.gz | |
configure.ac: Remove --disable-znodelete options
There is no reason to disable this linker flags, and we are not going to
add this option in our meson build system, so remove it from autotools
too to be on par. If anyone complains with a valid use-case we can add
them back.
Keeping -Bsymbolc for now because it is used for refdbg and Debian has a
package that build glib with that flag.
https://bugzilla.gnome.org/show_bug.cgi?id=788771
| -rw-r--r-- | configure.ac | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index e568399cc..823c45bda 100644 --- a/configure.ac +++ b/configure.ac @@ -3441,27 +3441,25 @@ dnl we also try to check for the --fatal-warnings linker flag if dnl auto-detecting. dnl -AC_ARG_ENABLE([znodelete], - [AS_HELP_STRING([--disable-znodelete], - [avoid linking with -z,nodelete])],, - [SAVED_CFLAGS="${CFLAGS}" SAVED_LDFLAGS="${LDFLAGS}" SAVED_LIBS="${LIBS}" - AC_MSG_CHECKING([for --fatal-warnings linker flag]) - CFLAGS="${SAVED_CFLAGS} ${shared_flag:- -shared}" - LDFLAGS=-Wl,--fatal-warnings - LIBS= - AC_TRY_LINK([], [return 0], - AC_MSG_RESULT(yes) - [ldflags_fatal=-Wl,--fatal-warnings], - AC_MSG_RESULT(no) - ldflags_fatal=) - AC_MSG_CHECKING([for -z,nodelete linker flag]) - LDFLAGS="$ldflags_fatal -Wl,-z,nodelete" - AC_TRY_LINK([], [return 0], - AC_MSG_RESULT(yes) - enable_znodelete=yes, - AC_MSG_RESULT(no) - enable_znodelete=no) - CFLAGS="${SAVED_CFLAGS}" LDFLAGS="${SAVED_LDFLAGS}" LIBS="${SAVED_LIBS}"]) +SAVED_CFLAGS="${CFLAGS}" SAVED_LDFLAGS="${LDFLAGS}" SAVED_LIBS="${LIBS}" +AC_MSG_CHECKING([for --fatal-warnings linker flag]) +CFLAGS="${SAVED_CFLAGS} ${shared_flag:- -shared}" +LDFLAGS=-Wl,--fatal-warnings +LIBS= +AC_TRY_LINK([], [return 0], + AC_MSG_RESULT(yes) + [ldflags_fatal=-Wl,--fatal-warnings], + AC_MSG_RESULT(no) + ldflags_fatal=) + +AC_MSG_CHECKING([for -z,nodelete linker flag]) +LDFLAGS="$ldflags_fatal -Wl,-z,nodelete" +AC_TRY_LINK([], [return 0], + AC_MSG_RESULT(yes) + enable_znodelete=yes, + AC_MSG_RESULT(no) + enable_znodelete=no) +CFLAGS="${SAVED_CFLAGS}" LDFLAGS="${SAVED_LDFLAGS}" LIBS="${SAVED_LIBS}" if test "x${enable_znodelete}" = "xyes"; then GLIB_LINK_FLAGS="$GLIB_LINK_FLAGS -Wl,-z,nodelete" |