Skip to content

Commit

Permalink
pythongh-101047: Remove vestigial references to macOS libtool options (
Browse files Browse the repository at this point in the history
…pythongh-101048)

LIBTOOL_CRUFT and OTHER_LIBTOOL_OPT variables have been unused since commit
1919983 in 2011.
  • Loading branch information
indygreg authored Jan 22, 2023
1 parent 4db6452 commit 79af40a
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 172 deletions.
3 changes: 0 additions & 3 deletions Makefile.pre.in
Original file line number Diff line number Diff line change
Expand Up @@ -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@

Expand Down
93 changes: 0 additions & 93 deletions configure

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

76 changes: 0 additions & 76 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 79af40a

Please sign in to comment.