From 88d40099b317dba3b1d18d328947c3d8b6c72897 Mon Sep 17 00:00:00 2001
From: Antti Kantee <pooka@iki.fi>
Date: Mon, 29 Jun 2015 22:45:07 +0000
Subject: [PATCH] pseudolinkstubs.o is constant => nuke app-tools !STUBLDLIBS!

---
 app-tools/Makefile.app-tools | 3 ---
 app-tools/specs-stub.in      | 3 ++-
 platform/Makefile.inc        | 4 ----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/app-tools/Makefile.app-tools b/app-tools/Makefile.app-tools
index 36b473c28..a636faeb8 100644
--- a/app-tools/Makefile.app-tools
+++ b/app-tools/Makefile.app-tools
@@ -25,8 +25,6 @@ _APP_TOOL_TARGETS:= \
 .PHONY: app-tools
 app-tools: $(_APP_TOOL_TARGETS)
 
-APP_TOOLS_STUBLDLIBS := $(RUMP_STUBLDLIBS)
-
 APP_TOOLS_MAKE := $(APP_TOOLS_DIR)/rumprun-$(APP_TOOLS_PLATFORM)-make
 APP_TOOLS_CC := $(APP_TOOLS_DIR)/rumprun-$(APP_TOOLS_PLATFORM)-cc
 
@@ -45,7 +43,6 @@ $(APP_TOOLS_DIR)/rumprun-$(APP_TOOLS_PLATFORM)-${1}:			\
 		-e 's#!CFLAGS!#$(BUILDRUMP_TOOL_CFLAGS)#g;'		\
 		-e 's#!CXXFLAGS!#$(BUILDRUMP_TOOL_CXXFLAGS)#g;'		\
 		-e 's#!OBJS_BAKE!#$(APP_TOOLS_OBJS_BAKE)#g;'		\
-		-e 's#!STUBLDLIBS!#$(APP_TOOLS_STUBLDLIBS)#g;'		\
 		-e 's#!LDFLAGS_BAKE!#$(LDFLAGS_BAKE)#g;'		\
 		-e 's#!LDSCRIPT_BAKE!#$(APP_TOOLS_LDSCRIPT_BAKE)#g;'
 	if test -x $$<; then chmod +x $$@.tmp; fi
diff --git a/app-tools/specs-stub.in b/app-tools/specs-stub.in
index b7724fa30..0cf4e892a 100644
--- a/app-tools/specs-stub.in
+++ b/app-tools/specs-stub.in
@@ -5,7 +5,8 @@
 
 
 *lib:
--L!BASE_DIR!/rumprun/lib --start-group -lpthread -lc --end-group !STUBLDLIBS!
+-L!BASE_DIR!/rumprun/lib --start-group -lpthread -lc --end-group 	\
+    !BASE_DIR!/platform/pseudolinkstubs.o
 
 *link:
 %{m64:-m elf_x86_64;mx32:-m elf32_x86_64;m32:-m elf_i386} %:replace-outfile(-lstdc++ -lc++) %{rdynamic:}
diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index 61b7be728..6618b6322 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -14,10 +14,6 @@ COMMONDIR:=	$(abspath ../)
 LDFLAGS_BAKE+=	-L${BASEDIR}/${PLATFORM} -L${COREDIR}/${PLATFORM}	\
 		-L${RUMPUSERDIR}/${PLATFORM}
 
-LIBS_USERSTUB:=	${COMMONDIR}/pseudolinkstubs.o
-
-RUMP_STUBLDLIBS:=${LIBS_USERSTUB}
-
 .PHONY: ${BASEDIR}/${PLATFORM}/librumprun_base.a
 ${BASEDIR}/${PLATFORM}/librumprun_base.a:
 	( cd ${BASEDIR} \