LDSCRIPT -> LDSCRIPT_BAKE (and remove LDSCRIPT from specs-stub)

rumpkernel · Jun 29, 2015 · 33f14d3 · 33f14d3
1 parent 2f0c701
commit 33f14d3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/app-tools/Makefile.app-tools b/app-tools/Makefile.app-tools
@@ -1,5 +1,5 @@
 _APPTOOLS_PARAMS=  APP_TOOLS_GNUPLATFORM APP_TOOLS_PLATFORM APP_TOOLS_DIR
-_APPTOOLS_PARAMS+= APP_TOOLS_BAKEOBJS APP_TOOLS_LDSCRIPT
+_APPTOOLS_PARAMS+= APP_TOOLS_BAKEOBJS APP_TOOLS_LDSCRIPT_BAKE
 _APPTOOLS_PARAMS+= LDFLAGS_BAKE
 
 define varchk_tmpl
@@ -49,7 +49,7 @@ $(APP_TOOLS_DIR)/rumprun-$(APP_TOOLS_PLATFORM)-${1}:			\
 		-e 's#!LDLIBS!#$(APP_TOOLS_LDLIBS)#g;'			\
 		-e 's#!STUBLDLIBS!#$(APP_TOOLS_STUBLDLIBS)#g;'		\
 		-e 's#!LDFLAGS_BAKE!#$(LDFLAGS_BAKE)#g;'		\
-		-e 's#!LDSCRIPT!#$(APP_TOOLS_LDSCRIPT)#g;'
+		-e 's#!LDSCRIPT_BAKE!#$(APP_TOOLS_LDSCRIPT_BAKE)#g;'
 	if test -x $$<; then chmod +x $$@.tmp; fi
 	mv -f $$@.tmp $$@
 endef

diff --git a/app-tools/specs-bake.in b/app-tools/specs-bake.in
@@ -10,7 +10,7 @@
     -lbmk_rumpuser -lbmk_core
 
 *link:
-%{m64:-m elf_x86_64;mx32:-m elf32_x86_64;m32:-m elf_i386} -T !LDSCRIPT! %:replace-outfile(-lstdc++ -lc++) %{rdynamic:}
+%{m64:-m elf_x86_64;mx32:-m elf32_x86_64;m32:-m elf_i386} -T !LDSCRIPT_BAKE! %:replace-outfile(-lstdc++ -lc++) %{rdynamic:}
 
 %rename link_libgcc old_link_libgcc
 

diff --git a/app-tools/specs-stub.in b/app-tools/specs-stub.in
@@ -8,7 +8,7 @@
 -L!BASE_DIR!/rumprun/lib --start-group -lpthread -lc --end-group !STUBLDLIBS!
 
 *link:
-%{m64:-m elf_x86_64;mx32:-m elf32_x86_64;m32:-m elf_i386} -T !LDSCRIPT! %:replace-outfile(-lstdc++ -lc++) %{rdynamic:}
+%{m64:-m elf_x86_64;mx32:-m elf32_x86_64;m32:-m elf_i386} %:replace-outfile(-lstdc++ -lc++) %{rdynamic:}
 
 %rename link_libgcc old_link_libgcc
 

diff --git a/platform/hw/Makefile b/platform/hw/Makefile
@@ -53,7 +53,7 @@ OBJS= ${OBJS_BMK} ${OBJS_APP}
 
 APP_TOOLS_PLATFORM= bmk
 APP_TOOLS_BAKEOBJS=	$(abspath rumprun.o)
-APP_TOOLS_LDSCRIPT:= $(abspath ${LDSCRIPT})
+APP_TOOLS_LDSCRIPT_BAKE:= $(abspath ${LDSCRIPT})
 APP_TOOLS_DIR:= $(abspath ../../app-tools)
 
 include ${APP_TOOLS_DIR}/Makefile.app-tools

diff --git a/platform/xen/Makefile b/platform/xen/Makefile
@@ -70,7 +70,7 @@ $(OBJ_DIR)/rumprun.o: $(RUMP_OBJS) commonlibs
 APP_TOOLS_PLATFORM= xen
 APP_TOOLS_BAKEOBJS=	$(abspath $(OBJ_DIR)/xen/minios.o)
 APP_TOOLS_BAKEOBJS+=	$(abspath $(OBJ_DIR)/rumprun.o)
-APP_TOOLS_LDSCRIPT:= $(abspath $(OBJ_DIR)/xen/minios.lds)
+APP_TOOLS_LDSCRIPT_BAKE:= $(abspath $(OBJ_DIR)/xen/minios.lds)
 APP_TOOLS_DIR= $(abspath ../../app-tools)
 
 include $(APP_TOOLS_DIR)/Makefile.app-tools