gh-101047: Remove vestigial references to macOS libtool options (gh-101048)

LIBTOOL_CRUFT and OTHER_LIBTOOL_OPT variables have been unused since commit
19199830f7f880b1e9cff5d92d30706fd8bb4700 in 2011.

diff --git a/Makefile.pre.in b/Makefile.pre.in
index d98f98634b7d913104580997af228dbe8f33cf66..618bb7b5f7307dbab3a63b38079f02a64b4f7613 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -198,9 +198,6 @@ LIPO_32BIT_FLAGS=@LIPO_32BIT_FLAGS@
 # Flags to lipo to produce an intel-64-only universal executable
 LIPO_INTEL64_FLAGS=@LIPO_INTEL64_FLAGS@
 
-# Options to enable prebinding (for fast startup prior to Mac OS X 10.3)
-OTHER_LIBTOOL_OPT=@OTHER_LIBTOOL_OPT@
-
 # Environment to run shared python without installed libraries
 RUNSHARED=       @RUNSHARED@
 

diff --git a/configure b/configure
index 144b35d3c7298aadcc8bccd21285f4b7bb9bd974..e4ec5c40fd7a367cb524c9a387bc7712e9b4a8d7 100755 (executable)
--- a/configure
+++ b/configure
@@ -874,8 +874,6 @@ LDSHARED
 SHLIB_SUFFIX
 DSYMUTIL_PATH
 DSYMUTIL
-LIBTOOL_CRUFT
-OTHER_LIBTOOL_OPT
 UNIVERSAL_ARCH_FLAGS
 WASM_STDLIB
 WASM_ASSETS_DIR
@@ -10910,97 +10908,6 @@ fi
 
 CC="$ac_save_cc"
 
-
-case $ac_sys_system/$ac_sys_release in
-  Darwin/[01567]\..*)
-    OTHER_LIBTOOL_OPT="-prebind -seg1addr 0x10000000"
-    ;;
-  Darwin/*)
-    OTHER_LIBTOOL_OPT=""
-    ;;
-esac
-
-
-
-case $ac_sys_system/$ac_sys_release in
-  Darwin/[01567]\..*)
-    LIBTOOL_CRUFT="-framework System -lcc_dynamic"
-    if test "${enable_universalsdk}"; then
-           :
-    else
-        LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `/usr/bin/arch`"
-    fi
-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
-  Darwin/*)
-    gcc_version=`gcc -dumpversion`
-    if test ${gcc_version} '<' 4.0
-        then
-            LIBTOOL_CRUFT="-lcc_dynamic"
-        else
-            LIBTOOL_CRUFT=""
-    fi
-    if test "$cross_compiling" = yes; then :
-  ac_osx_32bit=yes
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-    #include <unistd.h>
-    int main(int argc, char*argv[])
-    {
-      if (sizeof(long) == 4) {
-         return 0;
-      } else {
-         return 1;
-      }
-    }
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_osx_32bit=yes
-else
-  ac_osx_32bit=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-    if test "${ac_osx_32bit}" = "yes"; then
-       case `/usr/bin/arch` in
-       i386)
-               MACOSX_DEFAULT_ARCH="i386"
-               ;;
-       ppc)
-               MACOSX_DEFAULT_ARCH="ppc"
-               ;;
-       *)
-               as_fn_error $? "Unexpected output of 'arch' on macOS" "$LINENO" 5
-               ;;
-       esac
-    else
-       case `/usr/bin/arch` in
-       i386)
-               MACOSX_DEFAULT_ARCH="x86_64"
-               ;;
-       ppc)
-               MACOSX_DEFAULT_ARCH="ppc64"
-               ;;
-       arm64)
-               MACOSX_DEFAULT_ARCH="arm64"
-               ;;
-       *)
-               as_fn_error $? "Unexpected output of 'arch' on macOS" "$LINENO" 5
-               ;;
-       esac
-
-    fi
-
-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only ${MACOSX_DEFAULT_ARCH}"
-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
-esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-framework" >&5
 $as_echo_n "checking for --enable-framework... " >&6; }
 if test "$enable_framework"

diff --git a/configure.ac b/configure.ac
index 595adc67cf840190ce5d66c47f2356217703ece2..15412054856fe45439eff726f4c3ed0cf71eafaf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2964,82 +2964,6 @@ AS_VAR_IF([ac_cv_pthread_key_t_is_arithmetic_type], [yes], [
 
 CC="$ac_save_cc"
 
-AC_SUBST(OTHER_LIBTOOL_OPT)
-case $ac_sys_system/$ac_sys_release in
-  Darwin/@<:@01567@:>@\..*)
-    OTHER_LIBTOOL_OPT="-prebind -seg1addr 0x10000000"
-    ;;
-  Darwin/*)
-    OTHER_LIBTOOL_OPT=""
-    ;;
-esac
-
-
-AC_SUBST(LIBTOOL_CRUFT)
-case $ac_sys_system/$ac_sys_release in
-  Darwin/@<:@01567@:>@\..*)
-    LIBTOOL_CRUFT="-framework System -lcc_dynamic"
-    if test "${enable_universalsdk}"; then
-           :
-    else
-        LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `/usr/bin/arch`"
-    fi
-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
-  Darwin/*)
-    gcc_version=`gcc -dumpversion`
-    if test ${gcc_version} '<' 4.0
-        then
-            LIBTOOL_CRUFT="-lcc_dynamic"
-        else
-            LIBTOOL_CRUFT=""
-    fi
-    AC_RUN_IFELSE([AC_LANG_SOURCE([[
-    #include <unistd.h>
-    int main(int argc, char*argv[])
-    {
-      if (sizeof(long) == 4) {
-         return 0;
-      } else {
-         return 1;
-      }
-    }
-    ]])],[ac_osx_32bit=yes],[ac_osx_32bit=no],[ac_osx_32bit=yes])
-
-    if test "${ac_osx_32bit}" = "yes"; then
-       case `/usr/bin/arch` in
-       i386)
-               MACOSX_DEFAULT_ARCH="i386"
-               ;;
-       ppc)
-               MACOSX_DEFAULT_ARCH="ppc"
-               ;;
-       *)
-               AC_MSG_ERROR([Unexpected output of 'arch' on macOS])
-               ;;
-       esac
-    else
-       case `/usr/bin/arch` in
-       i386)
-               MACOSX_DEFAULT_ARCH="x86_64"
-               ;;
-       ppc)
-               MACOSX_DEFAULT_ARCH="ppc64"
-               ;;
-       arm64)
-               MACOSX_DEFAULT_ARCH="arm64"
-               ;;
-       *)
-               AC_MSG_ERROR([Unexpected output of 'arch' on macOS])
-               ;;
-       esac
-
-    fi
-
-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only ${MACOSX_DEFAULT_ARCH}"
-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
-esac
 AC_MSG_CHECKING(for --enable-framework)
 if test "$enable_framework"
 then