Merge branch 'master' of github.com:gnustep/tools-make into android_check

2025-04-23 22:33:28 +00:00 · 2020-11-17 19:57:11 -05:00 · 2020-11-17 19:57:11 -05:00 · b9a8ab1bc2
commit b9a8ab1bc2
parent 25111705c4 b9984cae70
4 changed files with 90 additions and 56 deletions
--- a/13
+++ b/13
@ -1,3 +1,16 @@
+2020-11-14  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* rules.make:
+	* target.make:
+	New variables FINAL_LDFLAGS and CORE_LDFLAGS such that ALL_LDFLAGS is
+	now a combination of the two, and is used for final linking of an
+	executable re shared library/bundle, while CORE_LDFLAGS is used when
+	performing a partial link in a subproject.
+
+2020-10-31  Yavor Doganov  <yavor@gnu.org>
+
+	* Instance/Documentation/texi.make: Honor @setfilename.
+
 2020-08-30  Ladislav Michl <ladis@linux-mips.org>

 	* configure.ac: Increase AC version number and use OBJCXX directly.
--- a/Instance/Documentation/texi.make
+++ b/Instance/Documentation/texi.make
@ -1,4 +1,4 @@
-#   -*-makefile-*-
+#   -*-makefile-gmake*-
 #   Instance/Documentation/texi.make
 #
 #   Instance Makefile rules to build Texinfo documentation.
@ -61,9 +61,23 @@ ifeq ($(GNUSTEP_TEXI2HTML_FLAGS),)
  GNUSTEP_TEXI2HTML_FLAGS =
 endif

-internal-doc-all_:: $(GNUSTEP_INSTANCE).info \
-                    $(GNUSTEP_INSTANCE).pdf \
-                    $(GNUSTEP_INSTANCE)/index.html
+# Extract @setfilename value from the .texi file, if available, and
+# set OUTFILE accordingly.  Ignore textdoc targets.
+# The @setfilename command may appear more than once in a Texinfo
+# file; we only need the first occurrence.  It may have ".info" suffix
+# or may be followed by a Texinfo comment.
+ifeq ($(TEXT_MAIN),)
+  SETFILENAME := $(shell grep ^@setfilename $(GNUSTEP_INSTANCE).texi)
+    ifneq ($(SETFILENAME),)
+      OUTFILE := $(subst .info,,$(word 2, $(SETFILENAME)))
+    else
+      OUTFILE := $(GNUSTEP_INSTANCE)
+  endif
+endif
+
+internal-doc-all_:: $(OUTFILE).info \
+                    $(OUTFILE).pdf \
+                    $(OUTFILE)/index.html

 internal-textdoc-all_:: $(GNUSTEP_INSTANCE)

@ -72,7 +86,7 @@ internal-textdoc-all_:: $(GNUSTEP_INSTANCE)
 # without worring that the build will crash if the user doesn't have the
 # doc programs. Also don't install them if they haven't been generated.

-$(GNUSTEP_INSTANCE).info: $(TEXI_FILES)
+$(OUTFILE).info: $(TEXI_FILES)
 	-$(GNUSTEP_MAKEINFO) $(GNUSTEP_MAKEINFO_FLAGS) $(ADDITIONAL_MAKEINFO_FLAGS) \
 		-o $@ $(GNUSTEP_INSTANCE).texi

@ -84,22 +98,22 @@ $(GNUSTEP_INSTANCE).ps: $(GNUSTEP_INSTANCE).dvi
 	-$(GNUSTEP_DVIPS) $(GNUSTEP_DVIPS_FLAGS) $(ADDITIONAL_DVIPS_FLAGS) \
 		$(GNUSTEP_INSTANCE).dvi -o $@

-$(GNUSTEP_INSTANCE).pdf: $(TEXI_FILES)
+$(OUTFILE).pdf: $(TEXI_FILES)
 	-$(GNUSTEP_TEXI2PDF) $(GNUSTEP_TEXI2PDF_FLAGS) $(ADDITIONAL_TEXI2PDF_FLAGS) \
 		$(GNUSTEP_INSTANCE).texi -o $@

 # Some versions of texi2html placed the html files in a subdirectory,
 # so after running it we try to move any from the subdirectory to
 # where they are expected.
-$(GNUSTEP_INSTANCE)/index.html: $(TEXI_FILES)
+$(OUTFILE)/index.html: $(TEXI_FILES)
 	-$(GNUSTEP_TEXI2HTML) \
                $(GNUSTEP_TEXI2HTML_FLAGS) $(ADDITIONAL_TEXI2HTML_FLAGS) \
 		$(GNUSTEP_INSTANCE).texi; \
-                if [ -f $(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE)_toc.html ]; \
+                if [ -f $(OUTFILE)/$(OUTFILE)_toc.html ]; \
                then \
-                  mv $(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE).html .; \
-                  mv $(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE)_*.html .; \
-                  rmdir $(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE); \
+                  mv $(OUTFILE)/$(OUTFILE).html .; \
+                  mv $(OUTFILE)/$(OUTFILE)_*.html .; \
+                  rmdir $(OUTFILE)/$(OUTFILE); \
                fi

 $(GNUSTEP_INSTANCE): $(TEXI_FILES) $(TEXT_MAIN)
@ -111,13 +125,13 @@ internal-doc-clean::
 	         $(GNUSTEP_INSTANCE).cp   \
 	         $(GNUSTEP_INSTANCE).cps  \
 	         $(GNUSTEP_INSTANCE).dvi  \
-	         $(GNUSTEP_INSTANCE).fn   \
-	         $(GNUSTEP_INSTANCE).info* \
+	         $(GNUSTEP_INSTANCE).fn*  \
+	         $(OUTFILE).info* \
 	         $(GNUSTEP_INSTANCE).ky   \
 	         $(GNUSTEP_INSTANCE).log  \
 	         $(GNUSTEP_INSTANCE).pg   \
 	         $(GNUSTEP_INSTANCE).ps   \
-	         $(GNUSTEP_INSTANCE).pdf  \
+	         $(OUTFILE).pdf  \
 	         $(GNUSTEP_INSTANCE).toc  \
 	         $(GNUSTEP_INSTANCE).tp   \
 	         $(GNUSTEP_INSTANCE).vr   \
@ -126,8 +140,8 @@ internal-doc-clean::
 		 $(GNUSTEP_INSTANCE)_*.html \
 	         $(GNUSTEP_INSTANCE).ps.gz  \
 	         $(GNUSTEP_INSTANCE).tar.gz \
-	         $(GNUSTEP_INSTANCE)/*$(END_ECHO)
-	-$(ECHO_NOTHING) rmdir $(GNUSTEP_INSTANCE) $(END_ECHO)
+	         $(OUTFILE)/*$(END_ECHO)
+	-$(ECHO_NOTHING) rmdir $(OUTFILE) $(END_ECHO)

 # NB: Only install doc files if they have been generated

@ -136,21 +150,21 @@ internal-doc-clean::
 # install-info too - to keep up-to-date the dir index in that
 # directory.  
 internal-doc-install_:: $(GNUSTEP_DOC_INFO)
-	if [ -f $(GNUSTEP_INSTANCE).pdf ]; then \
-	  $(INSTALL_DATA) $(GNUSTEP_INSTANCE).pdf \
+	if [ -f $(OUTFILE).pdf ]; then \
+	  $(INSTALL_DATA) $(OUTFILE).pdf \
 	                $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR); \
 	fi
-	if [ -f $(GNUSTEP_INSTANCE).info ]; then \
-	  $(INSTALL_DATA) $(GNUSTEP_INSTANCE).info* $(GNUSTEP_DOC_INFO); \
+	if [ -f $(OUTFILE).info ]; then \
+	  $(INSTALL_DATA) $(OUTFILE).info* $(GNUSTEP_DOC_INFO); \
 	fi
-	if [ -f i$(GNUSTEP_INSTANCE)_toc.html ]; then \
-	  $(INSTALL_DATA) $(GNUSTEP_INSTANCE)_*.html \
+	if [ -f i$(OUTFILE)_toc.html ]; then \
+	  $(INSTALL_DATA) $(OUTFILE)_*.html \
 	                  $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR) || true ; \
 	fi
-	if [ -f $(GNUSTEP_INSTANCE)/index.html ]; then \
-	  $(MKINSTALLDIRS) $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE); \
-	  $(INSTALL_DATA) $(GNUSTEP_INSTANCE)/*.html \
-	                  $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE); \
+	if [ -f $(OUTFILE)/index.html ]; then \
+	  $(MKINSTALLDIRS) $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)/$(OUTFILE); \
+	  $(INSTALL_DATA) $(OUTFILE)/*.html \
+	                  $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)/$(OUTFILE); \
 	fi

 $(GNUSTEP_DOC_INFO):
@ -158,15 +172,15 @@ $(GNUSTEP_DOC_INFO):

 internal-doc-uninstall_::
 	rm -f \
-          $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE).pdf
+          $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)/$(OUTFILE).pdf
 	rm -f \
-          $(GNUSTEP_DOC_INFO)/$(GNUSTEP_INSTANCE).info*
+          $(GNUSTEP_DOC_INFO)/$(OUTFILE).info*
 	rm -f \
-          $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)_*.html
+          $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)/$(OUTFILE)_*.html
 	rm -f \
-          $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE).html
+          $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)/$(OUTFILE).html
 	rm -f \
-	  $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)/*.html
+	  $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)/$(OUTFILE)/*.html

 #
 # textdoc targets - these should be merged with the doc targets
--- a/rules.make
+++ b/rules.make
@ -337,13 +337,19 @@ $(ADDITIONAL_JAVACFLAGS) $(AUXILIARY_JAVACFLAGS)
 ALL_JAVAHFLAGS = $(INTERNAL_CLASSPATHFLAGS) $(ADDITIONAL_JAVAHFLAGS) \
 $(AUXILIARY_JAVAHFLAGS)

+# CORE_LDFLAGS are those used for both partial link and final link.
 ifeq ($(shared),no)
-  ALL_LDFLAGS = $(STATIC_LDFLAGS)
+  CORE_LDFLAGS = $(STATIC_LDFLAGS)
 else
-  ALL_LDFLAGS =
+  CORE_LDFLAGS =
 endif
-ALL_LDFLAGS += $(ADDITIONAL_LDFLAGS) $(AUXILIARY_LDFLAGS) $(GUI_LDFLAGS) \
+CORE_LDFLAGS += $(ADDITIONAL_LDFLAGS) $(AUXILIARY_LDFLAGS) $(GUI_LDFLAGS) \
               $(BACKEND_LDFLAGS) $(SYSTEM_LDFLAGS) $(INTERNAL_LDFLAGS)
+
+# ALL_LDFLAGS are the set of flags used in the final link of an executable
+# or a shared library/bundle.
+ALL_LDFLAGS += $(CORE_LDFLAGS) $(FINAL_LDFLAGS)
+
 # In some cases, ld is used for linking instead of $(CC), so we can't use
 # this in ALL_LDFLAGS
 CC_LDFLAGS = $(RUNTIME_FLAG) $(ARC_OBJCFLAGS)
--- a/target.make
+++ b/target.make
@ -330,7 +330,7 @@ AFTER_INSTALL_SHARED_LIB_CMD = \
         $(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_FILE) )

 OBJ_MERGE_CMD = \
-	$(LD) -nostdlib -keep_private_externs $(OBJ_MERGE_CMD_FLAG) $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
+	$(LD) -nostdlib -keep_private_externs $(OBJ_MERGE_CMD_FLAG) $(CORE_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;

 STATIC_LIB_LINK_CMD	= \
 	/usr/bin/libtool $(STATIC_LD_PREFLAGS) -static $(ARCH_FLAGS) $(ALL_LDFLAGS) -o $@ $^ \
@ -518,7 +518,7 @@ AFTER_INSTALL_SHARED_LIB_CHOWN = \
 	chown $(CHOWN_TO) $(LIB_LINK_FILE))

 OBJ_MERGE_CMD		= \
-	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
+	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(CORE_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;

 SHARED_CFLAGS      += -fPIC
 SHARED_LIBEXT      =  .so
@ -526,7 +526,7 @@ SHARED_LIBEXT      =  .so
 HAVE_BUNDLES       =  yes
 BUNDLE_LD	   =  $(LD)
 BUNDLE_LDFLAGS     += -shared
-ADDITIONAL_LDFLAGS += -rdynamic
+FINAL_LDFLAGS      = -rdynamic
 STATIC_LDFLAGS += -static
 endif
 #
@ -567,7 +567,7 @@ AFTER_INSTALL_SHARED_LIB_CHOWN = \
 	chown $(CHOWN_TO) $(LIB_LINK_SONAME_FILE); \
 	chown $(CHOWN_TO) $(LIB_LINK_FILE))
 OBJ_MERGE_CMD		= \
-	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
+	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(CORE_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;

 SHARED_CFLAGS	+= -fPIC
 SHARED_LIBEXT	= .so
@ -575,7 +575,7 @@ SHARED_LIBEXT	= .so
 HAVE_BUNDLES	= yes
 BUNDLE_LD	= $(LD)
 BUNDLE_LDFLAGS	+= -shared
-ADDITIONAL_LDFLAGS += -rdynamic
+FINAL_LDFLAGS   = -rdynamic
 STATIC_LDFLAGS += -static

 endif
@ -601,7 +601,7 @@ SHARED_LIB_LINK_CMD = \
 	  $(RM_LN_S) $(LIB_LINK_FILE); \
 	  $(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_FILE))
 OBJ_MERGE_CMD		= \
-	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
+	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(CORE_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;

 SHARED_CFLAGS	+= -fPIC
 SHARED_LIBEXT	= .so
@ -609,7 +609,7 @@ SHARED_LIBEXT	= .so
 HAVE_BUNDLES	= yes
 BUNDLE_LD	= $(LD)
 BUNDLE_LDFLAGS	+= -shared
-ADDITIONAL_LDFLAGS += -rdynamic
+FINAL_LDFLAGS   = -rdynamic
 ADDITIONAL_INCLUDE_DIRS += 
 STATIC_LDFLAGS += -static
 endif
@ -634,7 +634,7 @@ SHARED_LIB_LINK_CMD = \
 	  $(RM_LN_S) $(LIB_LINK_FILE); \
 	  $(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_FILE))
 OBJ_MERGE_CMD		= \
-	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
+	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(CORE_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;

 SHARED_CFLAGS	+= -fPIC
 SHARED_LIBEXT	= .so
@ -642,7 +642,8 @@ SHARED_LIBEXT	= .so
 HAVE_BUNDLES	= yes
 BUNDLE_LD	= $(LD)
 BUNDLE_LDFLAGS	+= -shared
-ADDITIONAL_LDFLAGS += -rdynamic -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -Wl,-R/usr/X11R6/lib -L/usr/X11R6/lib
+ADDITIONAL_LDFLAGS += -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -Wl,-R/usr/X11R6/lib -L/usr/X11R6/lib
+FINAL_LDFLAGS   = -rdynamic
 ADDITIONAL_INCLUDE_DIRS += -I/usr/pkg/include
 STATIC_LDFLAGS += -static
 endif
@ -680,7 +681,7 @@ AFTER_INSTALL_SHARED_LIB_CMD = \
 	)

 OBJ_MERGE_CMD		= \
-	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
+	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(CORE_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;

 SHARED_CFLAGS   += -fPIC
 SHARED_LIBEXT   = .so
@ -714,7 +715,7 @@ SHARED_LIB_LINK_CMD = \
 	  $(RM_LN_S) $(LIB_LINK_FILE); \
 	  $(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_FILE))
 OBJ_MERGE_CMD		= \
-	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
+	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(CORE_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;

 SHARED_CFLAGS	+= -fPIC
 SHARED_LIBEXT	= .so
@ -722,7 +723,7 @@ SHARED_LIBEXT	= .so
 HAVE_BUNDLES	= yes
 BUNDLE_LD	= $(LD)
 BUNDLE_LDFLAGS	+= -shared
-ADDITIONAL_LDFLAGS += -rdynamic
+FINAL_LDFLAGS   = -rdynamic
 STATIC_LDFLAGS += -static
 # Newer gcc's don't define this in Objective-C programs:
 AUXILIARY_CPPFLAGS += -D__LANGUAGES_C__
@ -771,7 +772,7 @@ SHARED_CFLAGS  += -fPIC
 SHARED_LIBEXT   = .so

 OBJ_MERGE_CMD		= \
-	$(LD) $(OBJ_MERGE_CMD_FLAG) $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
+	$(LD) $(OBJ_MERGE_CMD_FLAG) $(CORE_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;

 ADDITIONAL_LDFLAGS +=
 STATIC_LDFLAGS +=
@ -846,7 +847,7 @@ DLL_LIBEXT	 = .dll

 ifneq ($(CC),clang)
 OBJ_MERGE_CMD = \
-  $(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
+  $(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(CORE_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
 else
 OBJ_MERGE_CMD = \
  ar cr $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
@ -945,7 +946,7 @@ DLL_LIBEXT	 = .dll

 ifneq ($(CC),clang)
 OBJ_MERGE_CMD = \
-  $(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
+  $(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(CORE_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
 else
 OBJ_MERGE_CMD = \
  ar cr $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
@ -1024,7 +1025,7 @@ CYGWIN_LD_FLAGS = -Wl,--export-all-symbols -Wl,--enable-auto-import
 #SHARED_CFLAGS	 += 

 OBJ_MERGE_CMD = \
-	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(ALL_LDFLAGS) $(CYGWIN_LD_FLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
+	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(CORE_LDFLAGS) $(CYGWIN_LD_FLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;

 HAVE_BUNDLES   = yes
 BUNDLE_LD      = $(LD)
@ -1085,7 +1086,7 @@ AFTER_INSTALL_SHARED_LIB_CHOWN = \
 	chown $(CHOWN_TO) $(LIB_LINK_FILE))

 OBJ_MERGE_CMD		= \
-	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
+	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(CORE_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;

 SHARED_CFLAGS     += -fpic -fPIC -std=gnu99
 SHARED_LIBEXT   = .so
@ -1145,7 +1146,7 @@ SHARED_LIB_LINK_CMD     = \
          $(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_FILE))

 OBJ_MERGE_CMD		= \
-	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
+	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(CORE_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;

 ifeq ($(CC), cc)
 SHARED_CFLAGS   += +z
@ -1206,7 +1207,7 @@ AFTER_INSTALL_SHARED_LIB_CHOWN = \
 	chown $(CHOWN_TO) $(LIB_LINK_FILE))

 OBJ_MERGE_CMD		= \
-	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
+	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(CORE_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;

 SHARED_CFLAGS      += -fPIC
 SHARED_LIBEXT      =  .so
@ -1214,7 +1215,7 @@ SHARED_LIBEXT      =  .so
 HAVE_BUNDLES       =  yes
 BUNDLE_LD	   =  $(LD)
 BUNDLE_LDFLAGS     += -shared
-ADDITIONAL_LDFLAGS += -rdynamic
+FINAL_LDFLAGS      = -rdynamic
 STATIC_LDFLAGS += -static
 endif
 #
@ -1256,7 +1257,7 @@ AFTER_INSTALL_SHARED_LIB_CHOWN = \
 	chown $(CHOWN_TO) $(LIB_LINK_FILE))

 OBJ_MERGE_CMD		= \
-	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
+	$(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(CORE_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;

 SHARED_CFLAGS      += -fPIC
 SHARED_LIBEXT      =  .so
@ -1264,7 +1265,7 @@ SHARED_LIBEXT      =  .so
 HAVE_BUNDLES       =  yes
 BUNDLE_LD	   =  $(LD)
 BUNDLE_LDFLAGS     += -shared
-ADDITIONAL_LDFLAGS += -rdynamic
+FINAL_LDFLAGS      = -rdynamic
 STATIC_LDFLAGS += -static
 endif
 #