diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-10-13 17:01:10 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-10-13 17:01:10 (GMT) |
| commit | d4958c2832b9b42c2d01d19119287bf35a7a9311 (patch) | |
| tree | 4fb1427fdd847dcaa58b8c87409e9497199363dc /configure.in | |
| parent | 834bd81c51568c12d8dc7ff77025d6a61d5ce7e1 (diff) | |
| download | cpython-d4958c2832b9b42c2d01d19119287bf35a7a9311.zip cpython-d4958c2832b9b42c2d01d19119287bf35a7a9311.tar.gz cpython-d4958c2832b9b42c2d01d19119287bf35a7a9311.tar.bz2 | |
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.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/configure.in b/configure.in index 80c581b..31ed91e 100644 --- a/configure.in +++ b/configure.in @@ -1694,8 +1694,8 @@ then fi ;; OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";; Darwin/1.3*) - LDSHARED='$(CC) $(LDFLAGS) -bundle' - LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle' + LDSHARED='$(CC) -bundle' + LDCXXSHARED='$(CXX) -bundle' if test "$enable_framework" ; then # Link against the framework. All externals should be defined. BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' @@ -1707,8 +1707,8 @@ then LDCXXSHARED="$LDCXXSHARED -undefined suppress" fi ;; Darwin/1.4*|Darwin/5.*|Darwin/6.*) - LDSHARED='$(CC) $(LDFLAGS) -bundle' - LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle' + LDSHARED='$(CC) -bundle' + LDCXXSHARED='$(CXX) -bundle' if test "$enable_framework" ; then # Link against the framework. All externals should be defined. BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' @@ -1729,12 +1729,12 @@ then if test "${enable_universalsdk}"; then LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}" fi - LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup' - LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle -undefined dynamic_lookup' + LDSHARED='$(CC) -bundle -undefined dynamic_lookup' + LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup' BLDSHARED="$LDSHARED" else - LDSHARED='$(CC) $(LDFLAGS) -bundle' - LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle' + LDSHARED='$(CC) -bundle' + LDCXXSHARED='$(CXX) -bundle' if test "$enable_framework" ; then # Link against the framework. All externals should be defined. BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' @@ -1757,30 +1757,30 @@ then FreeBSD*) if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]] then - LDSHARED='$(CC) -shared ${LDFLAGS}' - LDCXXSHARED='$(CXX) -shared ${LDFLAGS}' + LDSHARED='$(CC) -shared' + LDCXXSHARED='$(CXX) -shared' else - LDSHARED="ld -Bshareable ${LDFLAGS}" + LDSHARED="ld -Bshareable" fi;; OpenBSD*) if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]] then - LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}' - LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}' + LDSHARED='$(CC) -shared $(CCSHARED)' + LDCXXSHARED='$(CXX) -shared $(CCSHARED)' else case `uname -r` in [[01]].* | 2.[[0-7]] | 2.[[0-7]].*) LDSHARED="ld -Bshareable ${LDFLAGS}" ;; *) - LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}' - LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}' + LDSHARED='$(CC) -shared $(CCSHARED)' + LDCXXSHARED='$(CXX) -shared $(CCSHARED)' ;; esac fi;; NetBSD*|DragonFly*) - LDSHARED="cc -shared ${LDFLAGS}" - LDCXXSHARED="c++ -shared ${LDFLAGS}";; + LDSHARED="cc -shared" + LDCXXSHARED="c++ -shared";; OpenUNIX*|UnixWare*) if test "$GCC" = "yes" ; then LDSHARED='$(CC) -shared' |