closes bpo-34869: Remove LDLAST. (GH-9667)
This commit is contained in:
parent
0c797a6aca
commit
65ed12cb7c
|
@ -98,7 +98,6 @@ PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST)
|
||||||
PY_CPPFLAGS= $(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS)
|
PY_CPPFLAGS= $(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS)
|
||||||
PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS)
|
PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS)
|
||||||
NO_AS_NEEDED= @NO_AS_NEEDED@
|
NO_AS_NEEDED= @NO_AS_NEEDED@
|
||||||
LDLAST= @LDLAST@
|
|
||||||
SGI_ABI= @SGI_ABI@
|
SGI_ABI= @SGI_ABI@
|
||||||
CCSHARED= @CCSHARED@
|
CCSHARED= @CCSHARED@
|
||||||
LINKFORSHARED= @LINKFORSHARED@
|
LINKFORSHARED= @LINKFORSHARED@
|
||||||
|
@ -568,7 +567,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
|
||||||
|
|
||||||
# Build the interpreter
|
# Build the interpreter
|
||||||
$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
|
$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
|
||||||
$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
|
||||||
|
|
||||||
platform: $(BUILDPYTHON) pybuilddir.txt
|
platform: $(BUILDPYTHON) pybuilddir.txt
|
||||||
$(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform
|
$(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform
|
||||||
|
@ -623,21 +622,21 @@ $(LIBRARY): $(LIBRARY_OBJS)
|
||||||
|
|
||||||
libpython$(LDVERSION).so: $(LIBRARY_OBJS)
|
libpython$(LDVERSION).so: $(LIBRARY_OBJS)
|
||||||
if test $(INSTSONAME) != $(LDLIBRARY); then \
|
if test $(INSTSONAME) != $(LDLIBRARY); then \
|
||||||
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
|
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
|
||||||
$(LN) -f $(INSTSONAME) $@; \
|
$(LN) -f $(INSTSONAME) $@; \
|
||||||
else \
|
else \
|
||||||
$(BLDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
|
$(BLDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
libpython3.so: libpython$(LDVERSION).so
|
libpython3.so: libpython$(LDVERSION).so
|
||||||
$(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^
|
$(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^
|
||||||
|
|
||||||
libpython$(LDVERSION).dylib: $(LIBRARY_OBJS)
|
libpython$(LDVERSION).dylib: $(LIBRARY_OBJS)
|
||||||
$(CC) -dynamiclib -Wl,-single_module $(PY_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(LDVERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
|
$(CC) -dynamiclib -Wl,-single_module $(PY_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(LDVERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
|
||||||
|
|
||||||
|
|
||||||
libpython$(VERSION).sl: $(LIBRARY_OBJS)
|
libpython$(VERSION).sl: $(LIBRARY_OBJS)
|
||||||
$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST)
|
$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM)
|
||||||
|
|
||||||
# Copy up the gdb python hooks into a position where they can be automatically
|
# Copy up the gdb python hooks into a position where they can be automatically
|
||||||
# loaded by gdb during Lib/test/test_gdb.py
|
# loaded by gdb during Lib/test/test_gdb.py
|
||||||
|
@ -677,7 +676,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
|
||||||
$(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS)
|
$(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS)
|
||||||
if test -n "$(DLLLIBRARY)"; then \
|
if test -n "$(DLLLIBRARY)"; then \
|
||||||
$(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \
|
$(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \
|
||||||
$(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST); \
|
$(LIBS) $(MODLIBS) $(SYSLIBS); \
|
||||||
else true; \
|
else true; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -699,7 +698,7 @@ Makefile Modules/config.c: Makefile.pre \
|
||||||
|
|
||||||
|
|
||||||
Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
|
Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
|
||||||
$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
|
||||||
|
|
||||||
############################################################################
|
############################################################################
|
||||||
# Importlib
|
# Importlib
|
||||||
|
@ -707,7 +706,7 @@ Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
|
||||||
Programs/_freeze_importlib.o: Programs/_freeze_importlib.c Makefile
|
Programs/_freeze_importlib.o: Programs/_freeze_importlib.c Makefile
|
||||||
|
|
||||||
Programs/_freeze_importlib: Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN)
|
Programs/_freeze_importlib: Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN)
|
||||||
$(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
$(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS)
|
||||||
|
|
||||||
.PHONY: regen-importlib
|
.PHONY: regen-importlib
|
||||||
regen-importlib: Programs/_freeze_importlib
|
regen-importlib: Programs/_freeze_importlib
|
||||||
|
|
|
@ -649,7 +649,6 @@ DTRACE_OBJS
|
||||||
DTRACE_HEADERS
|
DTRACE_HEADERS
|
||||||
DFLAGS
|
DFLAGS
|
||||||
DTRACE
|
DTRACE
|
||||||
LDLAST
|
|
||||||
TCLTK_LIBS
|
TCLTK_LIBS
|
||||||
TCLTK_INCLUDES
|
TCLTK_INCLUDES
|
||||||
LIBFFI_INCLUDEDIR
|
LIBFFI_INCLUDEDIR
|
||||||
|
@ -10292,8 +10291,6 @@ fi
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dbmliborder" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dbmliborder" >&5
|
||||||
$as_echo "$with_dbmliborder" >&6; }
|
$as_echo "$with_dbmliborder" >&6; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Templates for things AC_DEFINEd more than once.
|
# Templates for things AC_DEFINEd more than once.
|
||||||
# For a single AC_DEFINE, no template is needed.
|
# For a single AC_DEFINE, no template is needed.
|
||||||
|
|
||||||
|
|
|
@ -2955,8 +2955,6 @@ else
|
||||||
fi])
|
fi])
|
||||||
AC_MSG_RESULT($with_dbmliborder)
|
AC_MSG_RESULT($with_dbmliborder)
|
||||||
|
|
||||||
AC_SUBST(LDLAST)
|
|
||||||
|
|
||||||
# Templates for things AC_DEFINEd more than once.
|
# Templates for things AC_DEFINEd more than once.
|
||||||
# For a single AC_DEFINE, no template is needed.
|
# For a single AC_DEFINE, no template is needed.
|
||||||
AH_TEMPLATE(_REENTRANT,
|
AH_TEMPLATE(_REENTRANT,
|
||||||
|
|
Loading…
Reference in New Issue