Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 65ed12c

Browse files
benjaminpbenjaminp
authored
closes bpo-34869: Remove LDLAST. (GH-9667)
1 parent 0c797a6 commit 65ed12c

3 files changed

Lines changed: 8 additions & 14 deletions

File tree

‎Makefile.pre.in‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST)
9898
PY_CPPFLAGS= $(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS)
9999
PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS)
100100
NO_AS_NEEDED= @NO_AS_NEEDED@
101-
LDLAST= @LDLAST@
102101
SGI_ABI= @SGI_ABI@
103102
CCSHARED= @CCSHARED@
104103
LINKFORSHARED= @LINKFORSHARED@
@@ -568,7 +567,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
568567

569568
# Build the interpreter
570569
$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
571-
$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
570+
$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
572571

573572
platform: $(BUILDPYTHON) pybuilddir.txt
574573
$(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)
623622

624623
libpython$(LDVERSION).so: $(LIBRARY_OBJS)
625624
if test $(INSTSONAME) != $(LDLIBRARY); then \
626-
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
625+
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
627626
$(LN) -f $(INSTSONAME) $@; \
628627
else \
629-
$(BLDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
628+
$(BLDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
630629
fi
631630

632631
libpython3.so: libpython$(LDVERSION).so
633632
$(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^
634633

635634
libpython$(LDVERSION).dylib: $(LIBRARY_OBJS)
636-
$(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); \
635+
$(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); \
637636

638637

639638
libpython$(VERSION).sl: $(LIBRARY_OBJS)
640-
$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST)
639+
$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM)
641640

642641
# Copy up the gdb python hooks into a position where they can be automatically
643642
# loaded by gdb during Lib/test/test_gdb.py
@@ -677,7 +676,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
677676
$(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS)
678677
if test -n "$(DLLLIBRARY)"; then \
679678
$(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \
680-
$(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST); \
679+
$(LIBS) $(MODLIBS) $(SYSLIBS); \
681680
else true; \
682681
fi
683682

@@ -699,15 +698,15 @@ Makefile Modules/config.c: Makefile.pre \
699698

700699

701700
Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
702-
$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
701+
$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
703702

704703
############################################################################
705704
# Importlib
706705

707706
Programs/_freeze_importlib.o: Programs/_freeze_importlib.c Makefile
708707

709708
Programs/_freeze_importlib: Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN)
710-
$(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
709+
$(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS)
711710

712711
.PHONY: regen-importlib
713712
regen-importlib: Programs/_freeze_importlib

‎configure‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,6 @@ DTRACE_OBJS
649649
DTRACE_HEADERS
650650
DFLAGS
651651
DTRACE
652-
LDLAST
653652
TCLTK_LIBS
654653
TCLTK_INCLUDES
655654
LIBFFI_INCLUDEDIR
@@ -10292,8 +10291,6 @@ fi
1029210291
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dbmliborder" >&5
1029310292
$as_echo "$with_dbmliborder" >&6; }
1029410293

10295-
10296-
1029710294
# Templates for things AC_DEFINEd more than once.
1029810295
# For a single AC_DEFINE, no template is needed.
1029910296

‎configure.ac‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2955,8 +2955,6 @@ else
29552955
fi])
29562956
AC_MSG_RESULT($with_dbmliborder)
29572957

2958-
AC_SUBST(LDLAST)
2959-
29602958
# Templates for things AC_DEFINEd more than once.
29612959
# For a single AC_DEFINE, no template is needed.
29622960
AH_TEMPLATE(_REENTRANT,

0 commit comments

Comments
 (0)