Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d4958c2

Browse files
pitroupitrou
committed
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.
1 parent 834bd81 commit d4958c2

2 files changed

Lines changed: 35 additions & 35 deletions

File tree

‎configure‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# From configure.in Revision: 84946 .
2+
# From configure.in Revision: 85349 .
33
# Guess values for system-dependent variables and create Makefiles.
44
# Generated by GNU Autoconf 2.65 for python 3.2.
55
#
@@ -7511,8 +7511,8 @@ then
75117511
fi ;;
75127512
OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
75137513
Darwin/1.3*)
7514-
LDSHARED='$(CC) $(LDFLAGS) -bundle'
7515-
LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
7514+
LDSHARED='$(CC) -bundle'
7515+
LDCXXSHARED='$(CXX) -bundle'
75167516
if test "$enable_framework" ; then
75177517
# Link against the framework. All externals should be defined.
75187518
BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
@@ -7524,8 +7524,8 @@ then
75247524
LDCXXSHARED="$LDCXXSHARED -undefined suppress"
75257525
fi ;;
75267526
Darwin/1.4*|Darwin/5.*|Darwin/6.*)
7527-
LDSHARED='$(CC) $(LDFLAGS) -bundle'
7528-
LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
7527+
LDSHARED='$(CC) -bundle'
7528+
LDCXXSHARED='$(CXX) -bundle'
75297529
if test "$enable_framework" ; then
75307530
# Link against the framework. All externals should be defined.
75317531
BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
@@ -7546,12 +7546,12 @@ then
75467546
if test "${enable_universalsdk}"; then
75477547
LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
75487548
fi
7549-
LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
7550-
LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle -undefined dynamic_lookup'
7549+
LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
7550+
LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
75517551
BLDSHARED="$LDSHARED"
75527552
else
7553-
LDSHARED='$(CC) $(LDFLAGS) -bundle'
7554-
LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
7553+
LDSHARED='$(CC) -bundle'
7554+
LDCXXSHARED='$(CXX) -bundle'
75557555
if test "$enable_framework" ; then
75567556
# Link against the framework. All externals should be defined.
75577557
BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
@@ -7574,30 +7574,30 @@ then
75747574
FreeBSD*)
75757575
if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
75767576
then
7577-
LDSHARED='$(CC) -shared ${LDFLAGS}'
7578-
LDCXXSHARED='$(CXX) -shared ${LDFLAGS}'
7577+
LDSHARED='$(CC) -shared'
7578+
LDCXXSHARED='$(CXX) -shared'
75797579
else
7580-
LDSHARED="ld -Bshareable ${LDFLAGS}"
7580+
LDSHARED="ld -Bshareable"
75817581
fi;;
75827582
OpenBSD*)
75837583
if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
75847584
then
7585-
LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
7586-
LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
7585+
LDSHARED='$(CC) -shared $(CCSHARED)'
7586+
LDCXXSHARED='$(CXX) -shared $(CCSHARED)'
75877587
else
75887588
case `uname -r` in
75897589
[01].* | 2.[0-7] | 2.[0-7].*)
75907590
LDSHARED="ld -Bshareable ${LDFLAGS}"
75917591
;;
75927592
*)
7593-
LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
7594-
LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
7593+
LDSHARED='$(CC) -shared $(CCSHARED)'
7594+
LDCXXSHARED='$(CXX) -shared $(CCSHARED)'
75957595
;;
75967596
esac
75977597
fi;;
75987598
NetBSD*|DragonFly*)
7599-
LDSHARED="cc -shared ${LDFLAGS}"
7600-
LDCXXSHARED="c++ -shared ${LDFLAGS}";;
7599+
LDSHARED="cc -shared"
7600+
LDCXXSHARED="c++ -shared";;
76017601
OpenUNIX*|UnixWare*)
76027602
if test "$GCC" = "yes" ; then
76037603
LDSHARED='$(CC) -shared'

‎configure.in‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1694,8 +1694,8 @@ then
16941694
fi ;;
16951695
OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
16961696
Darwin/1.3*)
1697-
LDSHARED='$(CC) $(LDFLAGS) -bundle'
1698-
LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
1697+
LDSHARED='$(CC) -bundle'
1698+
LDCXXSHARED='$(CXX) -bundle'
16991699
if test "$enable_framework" ; then
17001700
# Link against the framework. All externals should be defined.
17011701
BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
@@ -1707,8 +1707,8 @@ then
17071707
LDCXXSHARED="$LDCXXSHARED -undefined suppress"
17081708
fi ;;
17091709
Darwin/1.4*|Darwin/5.*|Darwin/6.*)
1710-
LDSHARED='$(CC) $(LDFLAGS) -bundle'
1711-
LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
1710+
LDSHARED='$(CC) -bundle'
1711+
LDCXXSHARED='$(CXX) -bundle'
17121712
if test "$enable_framework" ; then
17131713
# Link against the framework. All externals should be defined.
17141714
BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
@@ -1729,12 +1729,12 @@ then
17291729
if test "${enable_universalsdk}"; then
17301730
LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
17311731
fi
1732-
LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
1733-
LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle -undefined dynamic_lookup'
1732+
LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
1733+
LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
17341734
BLDSHARED="$LDSHARED"
17351735
else
1736-
LDSHARED='$(CC) $(LDFLAGS) -bundle'
1737-
LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
1736+
LDSHARED='$(CC) -bundle'
1737+
LDCXXSHARED='$(CXX) -bundle'
17381738
if test "$enable_framework" ; then
17391739
# Link against the framework. All externals should be defined.
17401740
BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
@@ -1757,30 +1757,30 @@ then
17571757
FreeBSD*)
17581758
if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
17591759
then
1760-
LDSHARED='$(CC) -shared ${LDFLAGS}'
1761-
LDCXXSHARED='$(CXX) -shared ${LDFLAGS}'
1760+
LDSHARED='$(CC) -shared'
1761+
LDCXXSHARED='$(CXX) -shared'
17621762
else
1763-
LDSHARED="ld -Bshareable ${LDFLAGS}"
1763+
LDSHARED="ld -Bshareable"
17641764
fi;;
17651765
OpenBSD*)
17661766
if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
17671767
then
1768-
LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
1769-
LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
1768+
LDSHARED='$(CC) -shared $(CCSHARED)'
1769+
LDCXXSHARED='$(CXX) -shared $(CCSHARED)'
17701770
else
17711771
case `uname -r` in
17721772
[[01]].* | 2.[[0-7]] | 2.[[0-7]].*)
17731773
LDSHARED="ld -Bshareable ${LDFLAGS}"
17741774
;;
17751775
*)
1776-
LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
1777-
LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
1776+
LDSHARED='$(CC) -shared $(CCSHARED)'
1777+
LDCXXSHARED='$(CXX) -shared $(CCSHARED)'
17781778
;;
17791779
esac
17801780
fi;;
17811781
NetBSD*|DragonFly*)
1782-
LDSHARED="cc -shared ${LDFLAGS}"
1783-
LDCXXSHARED="c++ -shared ${LDFLAGS}";;
1782+
LDSHARED="cc -shared"
1783+
LDCXXSHARED="c++ -shared";;
17841784
OpenUNIX*|UnixWare*)
17851785
if test "$GCC" = "yes" ; then
17861786
LDSHARED='$(CC) -shared'

0 commit comments

Comments
 (0)