diff options
| author | Stefan Krah <stefan@bytereef.org> | 2010-11-28 15:30:05 +0000 |
|---|---|---|
| committer | Stefan Krah <stefan@bytereef.org> | 2010-11-28 15:30:05 +0000 |
| commit | 835d60d08446232a652a81748dfb262bebc90306 (patch) | |
| tree | eb960758b111759b78c2ede5876aebe7ff187e24 /configure.in | |
| parent | f6f4e2648922151a6b5dc0ed4557320402b524cd (diff) | |
| download | cpython-835d60d08446232a652a81748dfb262bebc90306.tar.gz | |
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.
........
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 a499a9b971..a61eb4569c 100644 --- a/configure.in +++ b/configure.in @@ -1790,8 +1790,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)' @@ -1803,8 +1803,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)' @@ -1825,12 +1825,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)' @@ -1853,30 +1853,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' |