mirror of
https://github.com/python/cpython.git
synced 2025-09-27 02:39:58 +00:00
Merged revisions 85422 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85422 | antoine.pitrou | 2010-10-13 19:01:10 +0200 (Wed, 13 Oct 2010) | 6 lines Followup to #9437: since LDFLAGS is now appended to LDSHARED in the Makefile, don't do in configure as well. Hopefully this will solve a Makefile parsing issue on the FreeBSD buildbots. ........
This commit is contained in:
Stefan Krah
parent
5ee8448fd8
commit
3a3e20311d
2 changed files with 35 additions and 35 deletions
36
configure
vendored
36
configure
vendored
|
|
@ -1,5 +1,5 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# From configure.in Revision: 86043 .
|
# From configure.in Revision: 86076 .
|
||||||
# Guess values for system-dependent variables and create Makefiles.
|
# Guess values for system-dependent variables and create Makefiles.
|
||||||
# Generated by GNU Autoconf 2.65 for python 2.7.
|
# Generated by GNU Autoconf 2.65 for python 2.7.
|
||||||
#
|
#
|
||||||
|
|
@ -7564,8 +7564,8 @@ then
|
||||||
fi ;;
|
fi ;;
|
||||||
OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
|
OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
|
||||||
Darwin/1.3*)
|
Darwin/1.3*)
|
||||||
LDSHARED='$(CC) $(LDFLAGS) -bundle'
|
LDSHARED='$(CC) -bundle'
|
||||||
LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
|
LDCXXSHARED='$(CXX) -bundle'
|
||||||
if test "$enable_framework" ; then
|
if test "$enable_framework" ; then
|
||||||
# Link against the framework. All externals should be defined.
|
# Link against the framework. All externals should be defined.
|
||||||
BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
||||||
|
|
@ -7577,8 +7577,8 @@ then
|
||||||
LDCXXSHARED="$LDCXXSHARED -undefined suppress"
|
LDCXXSHARED="$LDCXXSHARED -undefined suppress"
|
||||||
fi ;;
|
fi ;;
|
||||||
Darwin/1.4*|Darwin/5.*|Darwin/6.*)
|
Darwin/1.4*|Darwin/5.*|Darwin/6.*)
|
||||||
LDSHARED='$(CC) $(LDFLAGS) -bundle'
|
LDSHARED='$(CC) -bundle'
|
||||||
LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
|
LDCXXSHARED='$(CXX) -bundle'
|
||||||
if test "$enable_framework" ; then
|
if test "$enable_framework" ; then
|
||||||
# Link against the framework. All externals should be defined.
|
# Link against the framework. All externals should be defined.
|
||||||
BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
||||||
|
|
@ -7599,12 +7599,12 @@ then
|
||||||
if test "${enable_universalsdk}"; then
|
if test "${enable_universalsdk}"; then
|
||||||
LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
|
LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
|
||||||
fi
|
fi
|
||||||
LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
|
LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
|
||||||
LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle -undefined dynamic_lookup'
|
LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
|
||||||
BLDSHARED="$LDSHARED"
|
BLDSHARED="$LDSHARED"
|
||||||
else
|
else
|
||||||
LDSHARED='$(CC) $(LDFLAGS) -bundle'
|
LDSHARED='$(CC) -bundle'
|
||||||
LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
|
LDCXXSHARED='$(CXX) -bundle'
|
||||||
if test "$enable_framework" ; then
|
if test "$enable_framework" ; then
|
||||||
# Link against the framework. All externals should be defined.
|
# Link against the framework. All externals should be defined.
|
||||||
BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
||||||
|
|
@ -7627,30 +7627,30 @@ then
|
||||||
FreeBSD*)
|
FreeBSD*)
|
||||||
if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
|
if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
|
||||||
then
|
then
|
||||||
LDSHARED='$(CC) -shared ${LDFLAGS}'
|
LDSHARED='$(CC) -shared'
|
||||||
LDCXXSHARED='$(CXX) -shared ${LDFLAGS}'
|
LDCXXSHARED='$(CXX) -shared'
|
||||||
else
|
else
|
||||||
LDSHARED="ld -Bshareable ${LDFLAGS}"
|
LDSHARED="ld -Bshareable"
|
||||||
fi;;
|
fi;;
|
||||||
OpenBSD*)
|
OpenBSD*)
|
||||||
if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
|
if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
|
||||||
then
|
then
|
||||||
LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
|
LDSHARED='$(CC) -shared $(CCSHARED)'
|
||||||
LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
|
LDCXXSHARED='$(CXX) -shared $(CCSHARED)'
|
||||||
else
|
else
|
||||||
case `uname -r` in
|
case `uname -r` in
|
||||||
[01].* | 2.[0-7] | 2.[0-7].*)
|
[01].* | 2.[0-7] | 2.[0-7].*)
|
||||||
LDSHARED="ld -Bshareable ${LDFLAGS}"
|
LDSHARED="ld -Bshareable ${LDFLAGS}"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
|
LDSHARED='$(CC) -shared $(CCSHARED)'
|
||||||
LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
|
LDCXXSHARED='$(CXX) -shared $(CCSHARED)'
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi;;
|
fi;;
|
||||||
NetBSD*|DragonFly*)
|
NetBSD*|DragonFly*)
|
||||||
LDSHARED="cc -shared ${LDFLAGS}"
|
LDSHARED="cc -shared"
|
||||||
LDCXXSHARED="c++ -shared ${LDFLAGS}";;
|
LDCXXSHARED="c++ -shared";;
|
||||||
OpenUNIX*|UnixWare*)
|
OpenUNIX*|UnixWare*)
|
||||||
if test "$GCC" = "yes" ; then
|
if test "$GCC" = "yes" ; then
|
||||||
LDSHARED='$(CC) -shared'
|
LDSHARED='$(CC) -shared'
|
||||||
|
|
|
||||||
34
configure.in
34
configure.in
|
|
@ -1790,8 +1790,8 @@ then
|
||||||
fi ;;
|
fi ;;
|
||||||
OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
|
OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
|
||||||
Darwin/1.3*)
|
Darwin/1.3*)
|
||||||
LDSHARED='$(CC) $(LDFLAGS) -bundle'
|
LDSHARED='$(CC) -bundle'
|
||||||
LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
|
LDCXXSHARED='$(CXX) -bundle'
|
||||||
if test "$enable_framework" ; then
|
if test "$enable_framework" ; then
|
||||||
# Link against the framework. All externals should be defined.
|
# Link against the framework. All externals should be defined.
|
||||||
BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
||||||
|
|
@ -1803,8 +1803,8 @@ then
|
||||||
LDCXXSHARED="$LDCXXSHARED -undefined suppress"
|
LDCXXSHARED="$LDCXXSHARED -undefined suppress"
|
||||||
fi ;;
|
fi ;;
|
||||||
Darwin/1.4*|Darwin/5.*|Darwin/6.*)
|
Darwin/1.4*|Darwin/5.*|Darwin/6.*)
|
||||||
LDSHARED='$(CC) $(LDFLAGS) -bundle'
|
LDSHARED='$(CC) -bundle'
|
||||||
LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
|
LDCXXSHARED='$(CXX) -bundle'
|
||||||
if test "$enable_framework" ; then
|
if test "$enable_framework" ; then
|
||||||
# Link against the framework. All externals should be defined.
|
# Link against the framework. All externals should be defined.
|
||||||
BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
||||||
|
|
@ -1825,12 +1825,12 @@ then
|
||||||
if test "${enable_universalsdk}"; then
|
if test "${enable_universalsdk}"; then
|
||||||
LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
|
LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
|
||||||
fi
|
fi
|
||||||
LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
|
LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
|
||||||
LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle -undefined dynamic_lookup'
|
LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
|
||||||
BLDSHARED="$LDSHARED"
|
BLDSHARED="$LDSHARED"
|
||||||
else
|
else
|
||||||
LDSHARED='$(CC) $(LDFLAGS) -bundle'
|
LDSHARED='$(CC) -bundle'
|
||||||
LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
|
LDCXXSHARED='$(CXX) -bundle'
|
||||||
if test "$enable_framework" ; then
|
if test "$enable_framework" ; then
|
||||||
# Link against the framework. All externals should be defined.
|
# Link against the framework. All externals should be defined.
|
||||||
BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
||||||
|
|
@ -1853,30 +1853,30 @@ then
|
||||||
FreeBSD*)
|
FreeBSD*)
|
||||||
if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
|
if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
|
||||||
then
|
then
|
||||||
LDSHARED='$(CC) -shared ${LDFLAGS}'
|
LDSHARED='$(CC) -shared'
|
||||||
LDCXXSHARED='$(CXX) -shared ${LDFLAGS}'
|
LDCXXSHARED='$(CXX) -shared'
|
||||||
else
|
else
|
||||||
LDSHARED="ld -Bshareable ${LDFLAGS}"
|
LDSHARED="ld -Bshareable"
|
||||||
fi;;
|
fi;;
|
||||||
OpenBSD*)
|
OpenBSD*)
|
||||||
if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
|
if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
|
||||||
then
|
then
|
||||||
LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
|
LDSHARED='$(CC) -shared $(CCSHARED)'
|
||||||
LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
|
LDCXXSHARED='$(CXX) -shared $(CCSHARED)'
|
||||||
else
|
else
|
||||||
case `uname -r` in
|
case `uname -r` in
|
||||||
[[01]].* | 2.[[0-7]] | 2.[[0-7]].*)
|
[[01]].* | 2.[[0-7]] | 2.[[0-7]].*)
|
||||||
LDSHARED="ld -Bshareable ${LDFLAGS}"
|
LDSHARED="ld -Bshareable ${LDFLAGS}"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
|
LDSHARED='$(CC) -shared $(CCSHARED)'
|
||||||
LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
|
LDCXXSHARED='$(CXX) -shared $(CCSHARED)'
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi;;
|
fi;;
|
||||||
NetBSD*|DragonFly*)
|
NetBSD*|DragonFly*)
|
||||||
LDSHARED="cc -shared ${LDFLAGS}"
|
LDSHARED="cc -shared"
|
||||||
LDCXXSHARED="c++ -shared ${LDFLAGS}";;
|
LDCXXSHARED="c++ -shared";;
|
||||||
OpenUNIX*|UnixWare*)
|
OpenUNIX*|UnixWare*)
|
||||||
if test "$GCC" = "yes" ; then
|
if test "$GCC" = "yes" ; then
|
||||||
LDSHARED='$(CC) -shared'
|
LDSHARED='$(CC) -shared'
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue