Expand OBJS and LDLIBS separately for app-tools substitution

No functional change

diff --git a/Makefile b/Makefile
index 17980f4ac43a59a2cd4558a39dd6b97512f6de8f..212526da8d504dbe67505ca5d92ff17b9a41bbc2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -150,7 +150,7 @@ APP_TOOLS_LDLIBS := $(patsubst -L%, -L$$(abspath %), $(LDARCHLIB) $(LDLIBS)))
 # patsubst is normally expanded only once (beforehand), but we want to
 # apply abspath to each individual argument.
 
-APP_TOOLS_OBJS := $(OBJS) $(APP_TOOLS_LDLIBS)
+APP_TOOLS_OBJS := $(OBJS)
 
 APP_TOOLS_ARCH := $(subst x86_32,i386, \
                   $(subst x86_64,amd64, \
@@ -166,6 +166,7 @@ app-tools/%: app-tools/%.in Makefile Config.mk
                -e 's#!APPTOOLS!#$(abspath app-tools)#g;' \
                -e 's#!CPPFLAGS!#$(APP_TOOLS_CPPFLAGS)#g;' \
                -e 's#!OBJS!#$(APP_TOOLS_OBJS)#g;' \
+               -e 's#!LDLIBS!#$(APP_TOOLS_LDLIBS)#g;' \
                -e 's#!HEAD_OBJ!#$(abspath $(HEAD_OBJ))#g;' \
                -e 's#!LDSCRIPT!#$(abspath $(LDSCRIPT))#g;'
        if test -x $<; then chmod +x $@.tmp; fi

diff --git a/app-tools/specs.in b/app-tools/specs.in
index e7ac909ab0f289fdcb74d36e0e312c7adc632e37..be72d05b5b83be4a72e3cf1ee0b74aecf4b009c6 100644 (file)
--- a/app-tools/specs.in
+++ b/app-tools/specs.in
@@ -10,7 +10,7 @@
 %{m64:-m elf_x86_64;mx32:-m elf32_x86_64;m32:-m elf_i386}
 
 *endfile:
-!OBJS!
+!OBJS! !LDLIBS!
 
 *startfile:
 !HEAD_OBJ!