diff options
| author | Marek Polacek <polacek@redhat.com> | 2022-11-22 21:10:31 -0500 |
|---|---|---|
| committer | Marek Polacek <polacek@redhat.com> | 2022-11-22 21:10:31 -0500 |
| commit | 04711f5189a72c2fcaeed520d65582704adca042 (patch) | |
| tree | f0eb61aee9cb51bf6ff14bfef4429b1f77e99d26 /zlib | |
| parent | 30f399ee9318bcb44e3e2debde086303157a347d (diff) | |
| download | gcc-04711f5189a72c2fcaeed520d65582704adca042.zip gcc-04711f5189a72c2fcaeed520d65582704adca042.tar.gz gcc-04711f5189a72c2fcaeed520d65582704adca042.tar.bz2 | |
Revert "configure: Implement --enable-host-pie"
This reverts commit 251c72a68af3a8b0638705b73ef120ffdf0053eb.
Diffstat (limited to 'zlib')
| -rwxr-xr-x | zlib/configure | 28 | ||||
| -rw-r--r-- | zlib/configure.ac | 21 |
2 files changed, 7 insertions, 42 deletions
diff --git a/zlib/configure b/zlib/configure index 77be6c2..e35ac6e 100755 --- a/zlib/configure +++ b/zlib/configure @@ -635,8 +635,6 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS PICFLAG -enable_host_pie -enable_host_shared TARGET_LIBRARY_FALSE TARGET_LIBRARY_TRUE toolexeclibdir @@ -780,7 +778,6 @@ with_gnu_ld enable_libtool_lock with_toolexeclibdir enable_host_shared -enable_host_pie ' ac_precious_vars='build_alias host_alias @@ -1423,7 +1420,6 @@ Optional Features: optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --enable-host-shared build host code as shared libraries - --enable-host-pie build host code as PIE Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -10763,7 +10759,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10778 "configure" +#line 10762 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10869,7 +10865,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10884 "configure" +#line 10868 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11552,31 +11548,15 @@ else multilib_arg= fi -# Enable --enable-host-shared. # Check whether --enable-host-shared was given. if test "${enable_host_shared+set}" = set; then : - enableval=$enable_host_shared; -fi - - - -# Enable --enable-host-pie. -# Check whether --enable-host-pie was given. -if test "${enable_host_pie+set}" = set; then : - enableval=$enable_host_pie; -fi - - - -if test x$enable_host_shared = xyes; then - PICFLAG=-fPIC -elif test x$enable_host_pie = xyes; then - PICFLAG=-fPIE + enableval=$enable_host_shared; PICFLAG=-fPIC else PICFLAG= fi + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF diff --git a/zlib/configure.ac b/zlib/configure.ac index adf7aad..be1cfe2 100644 --- a/zlib/configure.ac +++ b/zlib/configure.ac @@ -122,26 +122,11 @@ else multilib_arg= fi -# Enable --enable-host-shared. AC_ARG_ENABLE(host-shared, [AS_HELP_STRING([--enable-host-shared], - [build host code as shared libraries])]) -AC_SUBST(enable_host_shared) - -# Enable --enable-host-pie. -AC_ARG_ENABLE(host-pie, -[AS_HELP_STRING([--enable-host-pie], - [build host code as PIE])]) -AC_SUBST(enable_host_pie) - -if test x$enable_host_shared = xyes; then - PICFLAG=-fPIC -elif test x$enable_host_pie = xyes; then - PICFLAG=-fPIE -else - PICFLAG= -fi - + [build host code as shared libraries])], +[PICFLAG=-fPIC], [PICFLAG=]) AC_SUBST(PICFLAG) + AC_CONFIG_FILES([Makefile]) AC_OUTPUT |