Skip to content

C
cpython
Kaydet (Commit) 36820b6e authored tarafından Ned Deily's avatar Ned Deily
Dosyalara gözat
Seçenekler

Issue #21811: Anticipated fixes to 3.x configure for OS X 10.10 Yosemite.

üst 04cdfa11
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 16 deletions
configure
Dosyayı görüntüle @ 36820b6e
...@@ -6551,10 +6551,16 @@ $as_echo "$CC" >&6; } ...@@ -6551,10 +6551,16 @@ $as_echo "$CC" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which MACOSX_DEPLOYMENT_TARGET to use" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking which MACOSX_DEPLOYMENT_TARGET to use" >&5
$as_echo_n "checking which MACOSX_DEPLOYMENT_TARGET to use... " >&6; } $as_echo_n "checking which MACOSX_DEPLOYMENT_TARGET to use... " >&6; }
cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'` cur_target_major=`sw_vers -productVersion | \
if test ${cur_target} '>' 10.2 && \ sed 's/\([0-9]*\)\.\([0-9]*\).*/\1/'`
test ${cur_target} '<' 10.6 cur_target_minor=`sw_vers -productVersion | \
sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'`
cur_target="${cur_target_major}.${cur_target_minor}"
if test ${cur_target_major} -eq 10 && \
test ${cur_target_minor} -ge 3 && \
test ${cur_target_minor} -le 5
then then
# OS X 10.3 through 10.5
cur_target=10.3 cur_target=10.3
if test ${enable_universalsdk} if test ${enable_universalsdk}
then then
...@@ -8540,12 +8546,14 @@ then ...@@ -8540,12 +8546,14 @@ then
# Use -undefined dynamic_lookup whenever possible (10.3 and later). # Use -undefined dynamic_lookup whenever possible (10.3 and later).
# This allows an extension to be used in any Python # This allows an extension to be used in any Python
if test ${MACOSX_DEPLOYMENT_TARGET} '>' 10.2 dep_target_major=`echo ${MACOSX_DEPLOYMENT_TARGET} | \
sed 's/\([0-9]*\)\.\([0-9]*\).*/\1/'`
dep_target_minor=`echo ${MACOSX_DEPLOYMENT_TARGET} | \
sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'`
if test ${dep_target_major} -eq 10 && \
test ${dep_target_minor} -le 2
then then
LDSHARED='$(CC) -bundle -undefined dynamic_lookup' # building for OS X 10.0 through 10.2
LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
BLDSHARED="$LDSHARED"
else
LDSHARED='$(CC) -bundle' LDSHARED='$(CC) -bundle'
LDCXXSHARED='$(CXX) -bundle' LDCXXSHARED='$(CXX) -bundle'
if test "$enable_framework" ; then if test "$enable_framework" ; then
...@@ -8559,6 +8567,11 @@ then ...@@ -8559,6 +8567,11 @@ then
LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
fi fi
else
# building for OS X 10.3 and later
LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
BLDSHARED="$LDSHARED"
fi fi
;; ;;
Linux*|GNU*|QNX*) Linux*|GNU*|QNX*)
......
configure.ac
Dosyayı görüntüle @ 36820b6e
...@@ -1318,10 +1318,16 @@ yes) ...@@ -1318,10 +1318,16 @@ yes)
# 4. If we are running on OS X 10.2 or earlier, good luck! # 4. If we are running on OS X 10.2 or earlier, good luck!
AC_MSG_CHECKING(which MACOSX_DEPLOYMENT_TARGET to use) AC_MSG_CHECKING(which MACOSX_DEPLOYMENT_TARGET to use)
cur_target=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'` cur_target_major=`sw_vers -productVersion | \
if test ${cur_target} '>' 10.2 && \ sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
test ${cur_target} '<' 10.6 cur_target_minor=`sw_vers -productVersion | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
cur_target="${cur_target_major}.${cur_target_minor}"
if test ${cur_target_major} -eq 10 && \
test ${cur_target_minor} -ge 3 && \
test ${cur_target_minor} -le 5
then then
# OS X 10.3 through 10.5
cur_target=10.3 cur_target=10.3
if test ${enable_universalsdk} if test ${enable_universalsdk}
then then
...@@ -2017,12 +2023,14 @@ then ...@@ -2017,12 +2023,14 @@ then
# Use -undefined dynamic_lookup whenever possible (10.3 and later). # Use -undefined dynamic_lookup whenever possible (10.3 and later).
# This allows an extension to be used in any Python # This allows an extension to be used in any Python
if test ${MACOSX_DEPLOYMENT_TARGET} '>' 10.2 dep_target_major=`echo ${MACOSX_DEPLOYMENT_TARGET} | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
dep_target_minor=`echo ${MACOSX_DEPLOYMENT_TARGET} | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
if test ${dep_target_major} -eq 10 && \
test ${dep_target_minor} -le 2
then then
LDSHARED='$(CC) -bundle -undefined dynamic_lookup' # building for OS X 10.0 through 10.2
LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
BLDSHARED="$LDSHARED"
else
LDSHARED='$(CC) -bundle' LDSHARED='$(CC) -bundle'
LDCXXSHARED='$(CXX) -bundle' LDCXXSHARED='$(CXX) -bundle'
if test "$enable_framework" ; then if test "$enable_framework" ; then
...@@ -2036,6 +2044,11 @@ then ...@@ -2036,6 +2044,11 @@ then
LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
fi fi
else
# building for OS X 10.3 and later
LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
BLDSHARED="$LDSHARED"
fi fi
;; ;;
Linux*|GNU*|QNX*) Linux*|GNU*|QNX*)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment