summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2018-12-23 12:54:57 -0800
committerNed Deily <nad@python.org>2018-12-23 15:54:57 -0500
commit68f5dfd955ee7a16fabf90d7c370159cc0ca9b75 (patch)
tree474fd5e5861f58cc8d0185e3b2dd4681b739ac41
parent5241ecff161ccf34083b6a824d1ae6d79917d889 (diff)
downloadcpython-git-68f5dfd955ee7a16fabf90d7c370159cc0ca9b75.tar.gz
bpo-35257: fix broken BLDSHARED - needs LDFLAGS too (GH-11297) (GH-11299)
`BLDSHARED` needs to have both `LDFLAGS` and `LDFLAGS_NODIST`, not just `LDFLAGS_NODIST`; `PY_CORE_LDFLAGS` provides both. For example, as it stands now with just `LDFLAGS_NODIST`, macOS universal builds are broken as the necessary `-arch` flags are no longer passed to the standard library extension module link step from `setup.py` resulting in extension modules being single architecture only. https://bugs.python.org/issue35257 (cherry picked from commit 44a3ee07e30e18d83e2730c093d8b0e930f0a06c) Co-authored-by: Ned Deily <nad@python.org>
-rw-r--r--Makefile.pre.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index da259f89de..d15d93509d 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -152,7 +152,7 @@ CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(LDVERSION)
SHLIB_SUFFIX= @SHLIB_SUFFIX@
EXT_SUFFIX= @EXT_SUFFIX@
LDSHARED= @LDSHARED@ $(PY_LDFLAGS)
-BLDSHARED= @BLDSHARED@ $(PY_LDFLAGS_NODIST)
+BLDSHARED= @BLDSHARED@ $(PY_CORE_LDFLAGS)
LDCXXSHARED= @LDCXXSHARED@
DESTSHARED= $(BINLIBDEST)/lib-dynload