Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
68e915e6
Commit
68e915e6
authored
Jun 25, 2014
by
Ned Deily
Browse files
Options
Browse Files
Download
Plain Diff
Issue #21811: Anticipated fixes to 3.x configure for OS X 10.10 Yosemite.
parents
ce38f24a
36820b6e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
16 deletions
+42
-16
configure
configure
+21
-8
configure.ac
configure.ac
+21
-8
No files found.
configure
View file @
68e915e6
...
...
@@ -6606,10 +6606,16 @@ $as_echo "$CC" >&6; }
{
$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
;
}
cur_target
=
`
sw_vers
-productVersion
|
sed
's/\(10\.[0-9]*\).*/\1/'
`
if
test
${
cur_target
}
'>'
10.2
&&
\
test
${
cur_target
}
'<'
10.6
cur_target_major
=
`
sw_vers
-productVersion
|
\
sed
's/\([0-9]*\)\.\([0-9]*\).*/\1/'
`
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
# OS X 10.3 through 10.5
cur_target
=
10.3
if
test
${
enable_universalsdk
}
then
...
...
@@ -8595,12 +8601,14 @@ then
# Use -undefined dynamic_lookup whenever possible (10.3 and later).
# 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
LDSHARED
=
'$(CC) -bundle -undefined dynamic_lookup'
LDCXXSHARED
=
'$(CXX) -bundle -undefined dynamic_lookup'
BLDSHARED
=
"
$LDSHARED
"
else
# building for OS X 10.0 through 10.2
LDSHARED
=
'$(CC) -bundle'
LDCXXSHARED
=
'$(CXX) -bundle'
if
test
"
$enable_framework
"
;
then
...
...
@@ -8614,6 +8622,11 @@ then
LDSHARED
=
"
$LDSHARED
"
'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
LDCXXSHARED
=
"
$LDCXXSHARED
"
'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
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
;;
Linux
*
|
GNU
*
|
QNX
*
)
...
...
configure.ac
View file @
68e915e6
...
...
@@ -1327,10 +1327,16 @@ yes)
# 4. If we are running on OS X 10.2 or earlier, good luck!
AC_MSG_CHECKING(which MACOSX_DEPLOYMENT_TARGET to use)
cur_target=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'`
if test ${cur_target} '>' 10.2 && \
test ${cur_target} '<' 10.6
cur_target_major=`sw_vers -productVersion | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
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
# OS X 10.3 through 10.5
cur_target=10.3
if test ${enable_universalsdk}
then
...
...
@@ -2026,12 +2032,14 @@ then
# Use -undefined dynamic_lookup whenever possible (10.3 and later).
# 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
LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
BLDSHARED="$LDSHARED"
else
# building for OS X 10.0 through 10.2
LDSHARED='$(CC) -bundle'
LDCXXSHARED='$(CXX) -bundle'
if test "$enable_framework" ; then
...
...
@@ -2045,6 +2053,11 @@ then
LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
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
;;
Linux*|GNU*|QNX*)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment