Skip to content

C
cpython
Commit d4958c28 authored by Antoine Pitrou's avatar Antoine Pitrou
Browse files
Options

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.
parent 834bd81c
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 35 deletions
configure
View file @ d4958c28
#! /bin/sh #! /bin/sh
# From configure.in Revision: 84946 . # From configure.in Revision: 85349 .
# 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 3.2. # Generated by GNU Autoconf 2.65 for python 3.2.
# #
...@@ -7511,8 +7511,8 @@ then ...@@ -7511,8 +7511,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)'
...@@ -7524,8 +7524,8 @@ then ...@@ -7524,8 +7524,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)'
...@@ -7546,12 +7546,12 @@ then ...@@ -7546,12 +7546,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)'
...@@ -7574,30 +7574,30 @@ then ...@@ -7574,30 +7574,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'
......
configure.in
View file @ d4958c28
...@@ -1694,8 +1694,8 @@ then ...@@ -1694,8 +1694,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)'
...@@ -1707,8 +1707,8 @@ then ...@@ -1707,8 +1707,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)'
...@@ -1729,12 +1729,12 @@ then ...@@ -1729,12 +1729,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)'
...@@ -1757,30 +1757,30 @@ then ...@@ -1757,30 +1757,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'
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7