File tree Expand file tree Collapse file tree 4 files changed +6
-8
lines changed
Expand file tree Collapse file tree 4 files changed +6
-8
lines changed Original file line number Diff line number Diff line change @@ -104,6 +104,8 @@ PY_LDFLAGS_NODIST=$(CONFIGURE_LDFLAGS_NODIST) $(LDFLAGS_NODIST)
104104NO_AS_NEEDED= @NO_AS_NEEDED@
105105SGI_ABI= @SGI_ABI@
106106CCSHARED= @CCSHARED@
107+ # LINKFORSHARED are the flags passed to the $(CC) command that links
108+ # the python executable -- this is only needed for a few systems
107109LINKFORSHARED= @LINKFORSHARED@
108110ARFLAGS= @ARFLAGS@
109111# Extra C flags added for building the interpreter object files.
Original file line number Diff line number Diff line change 1+ ``python-config --ldflags `` no longer includes flags of the
2+ ``LINKFORSHARED `` variable. The ``LINKFORSHARED `` variable must only be used
3+ to build executables.
Original file line number Diff line number Diff line change @@ -55,8 +55,6 @@ for opt in opt_flags:
5555 if opt == '--ldflags' :
5656 if not getvar ('Py_ENABLE_SHARED' ):
5757 libs .insert (0 , '-L' + getvar ('LIBPL' ))
58- if not getvar ('PYTHONFRAMEWORK' ):
59- libs .extend (getvar ('LINKFORSHARED' ).split ())
6058 print (' ' .join (libs ))
6159
6260 elif opt == '--extension-suffix' :
Original file line number Diff line number Diff line change @@ -44,7 +44,6 @@ ABIFLAGS="@ABIFLAGS@"
4444LIBS=" -lpython${VERSION}${ABIFLAGS} @LIBS@ $SYSLIBS "
4545BASECFLAGS=" @BASECFLAGS@"
4646LDLIBRARY=" @LDLIBRARY@"
47- LINKFORSHARED=" @LINKFORSHARED@"
4847OPT=" @OPT@"
4948PY_ENABLE_SHARED=" @PY_ENABLE_SHARED@"
5049LDVERSION=" @LDVERSION@"
8988 echo " $LIBS "
9089 ;;
9190 --ldflags)
92- LINKFORSHAREDUSED=
93- if [ -z " $PYTHONFRAMEWORK " ] ; then
94- LINKFORSHAREDUSED=$LINKFORSHARED
95- fi
9691 LIBPLUSED=
9792 if [ " $PY_ENABLE_SHARED " = " 0" ] ; then
9893 LIBPLUSED=" -L$LIBPL "
9994 fi
100- echo " $LIBPLUSED -L$libdir $LIBS $LINKFORSHAREDUSED "
95+ echo " $LIBPLUSED -L$libdir $LIBS "
10196 ;;
10297 --extension-suffix)
10398 echo " $SO "
You can’t perform that action at this time.
0 commit comments