Skip to content

Commit

Permalink
LDLIBS are now constant, so nuke from app-tools
Browse files Browse the repository at this point in the history
  • Loading branch information
anttikantee committed Jun 29, 2015
1 parent 3430430 commit d956d81
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 6 deletions.
2 changes: 0 additions & 2 deletions app-tools/Makefile.app-tools
Expand Up @@ -26,7 +26,6 @@ _APP_TOOL_TARGETS:= \
app-tools: $(_APP_TOOL_TARGETS)

APP_TOOLS_STUBLDLIBS := $(RUMP_STUBLDLIBS)
APP_TOOLS_LDLIBS := $(RUMP_LDLIBS)

APP_TOOLS_MAKE := $(APP_TOOLS_DIR)/rumprun-$(APP_TOOLS_PLATFORM)-make
APP_TOOLS_CC := $(APP_TOOLS_DIR)/rumprun-$(APP_TOOLS_PLATFORM)-cc
Expand All @@ -46,7 +45,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#!LDLIBS!#$(APP_TOOLS_LDLIBS)#g;' \
-e 's#!STUBLDLIBS!#$(APP_TOOLS_STUBLDLIBS)#g;' \
-e 's#!LDFLAGS_BAKE!#$(LDFLAGS_BAKE)#g;' \
-e 's#!LDSCRIPT_BAKE!#$(APP_TOOLS_LDSCRIPT_BAKE)#g;'
Expand Down
2 changes: 1 addition & 1 deletion app-tools/specs-bake.in
Expand Up @@ -5,7 +5,7 @@


*lib:
!LDFLAGS_BAKE! !LDLIBS! \
!LDFLAGS_BAKE! --whole-archive -lrump --no-whole-archive \
--start-group -lrumprun_base -lpthread -lc --end-group \
-lbmk_rumpuser -lbmk_core

Expand Down
3 changes: 0 additions & 3 deletions platform/Makefile.inc
Expand Up @@ -9,14 +9,11 @@ COREDIR:= $(shell pwd)/../../lib/libbmk_core
RUMPUSERDIR:= $(shell pwd)/../../lib/libbmk_rumpuser
BASEDIR:= $(shell pwd)/../../lib/librumprun_base

RUMPKERN_LIB:= -lrump

LDFLAGS_BAKE+= -L${BASEDIR}/${PLATFORM} -L${COREDIR}/${PLATFORM} \
-L${RUMPUSERDIR}/${PLATFORM}

LIBS_USERSTUB:= $(shell pwd)/pseudolinkstubs.o

RUMP_LDLIBS:= --whole-archive ${RUMPKERN_LIB} --no-whole-archive
RUMP_STUBLDLIBS:=${LIBS_USERSTUB}

.PHONY: ${BASEDIR}/${PLATFORM}/librumprun_base.a
Expand Down

0 comments on commit d956d81

Please sign in to comment.