diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2021-12-15 20:45:58 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2021-12-15 20:45:58 -0800 |
| commit | ab18659afc054434cef4d4757a3519f1100adc52 (patch) | |
| tree | f93a5c5823b4df35d43dd5e81c6c24e38e997512 /zlib | |
| parent | e1f8c14b9a0387e2beffeee002c56164166a265b (diff) | |
Revert "Sync with binutils: GCC: Pass --plugin to AR and RANLIB"
This reverts commit bf8cdd35117dea2049abbeebcdf14de11b323ef7.
Diffstat (limited to 'zlib')
| -rwxr-xr-x | zlib/configure | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/zlib/configure b/zlib/configure index 8ce61b11119..f489f31bc70 100755 --- a/zlib/configure +++ b/zlib/configure @@ -4169,7 +4169,7 @@ case "$host" in case "$enable_cet" in auto) # Check if target supports multi-byte NOPs - # and if compiler and assembler support CET insn. + # and if assembler supports CET insn. cet_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fcf-protection" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5502,19 +5502,6 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown -plugin_option= -plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" -for plugin in $plugin_names; do - plugin_so=`${CC} ${CFLAGS} --print-prog-name $plugin` - if test x$plugin_so = x$plugin; then - plugin_so=`${CC} ${CFLAGS} --print-file-name $plugin` - fi - if test x$plugin_so != x$plugin; then - plugin_option="--plugin $plugin_so" - break - fi -done - if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -5608,11 +5595,6 @@ else fi test -z "$AR" && AR=ar -if test -n "$plugin_option"; then - if $AR --help 2>&1 | grep -q "\--plugin"; then - AR="$AR $plugin_option" - fi -fi test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -5817,11 +5799,6 @@ else fi test -z "$RANLIB" && RANLIB=: -if test -n "$plugin_option" && test "$RANLIB" != ":"; then - if $RANLIB --help 2>&1 | grep -q "\--plugin"; then - RANLIB="$RANLIB $plugin_option" - fi -fi @@ -10758,7 +10735,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10761 "configure" +#line 10748 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10864,7 +10841,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10867 "configure" +#line 10854 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |