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>

diff --git a/Makefile.pre.in b/Makefile.pre.in
index da259f89de63045cd535a0293ae52f858ff744c2..d15d93509d13b6efbf05e10d3ed8427b05291a4e 100644 (file)
--- 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