summaryrefslogtreecommitdiff
path: root/Makefile.pre.in
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2018-12-23 12:48:00 -0800
committerGitHub <noreply@github.com>2018-12-23 12:48:00 -0800
commit3d4b4b80f290e622b05ca219ad6dabc07b49421a (patch)
treeb0f3e835af0ff0077ad8d2178f0c7f628a49841f /Makefile.pre.in
parenta58c8442f15914a43a83862f2644569263b1ed7d (diff)
downloadcpython-git-3d4b4b80f290e622b05ca219ad6dabc07b49421a.tar.gz
bpo-35257: fix broken BLDSHARED - needs LDFLAGS too (GH-11297)
`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>
Diffstat (limited to 'Makefile.pre.in')
-rw-r--r--Makefile.pre.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index d727288db8..2d2e11f172 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -155,7 +155,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