X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2FMakefile.tpl;h=d72ac6a24cfc32889454b33f6a9933f5c6e68321;hb=HEAD;hp=9cc0753bb9b055f4a7ec0eaa9f84eab50326d448;hpb=2bf08f0eb3461218cc493ef458fe100ae9158f28;p=tpg%2Facess2.git diff --git a/Usermode/Applications/Makefile.tpl b/Usermode/Applications/Makefile.tpl index 9cc0753b..d72ac6a2 100644 --- a/Usermode/Applications/Makefile.tpl +++ b/Usermode/Applications/Makefile.tpl @@ -19,6 +19,10 @@ LDFLAGS := $(subst -Map ,-Wl$(comma)-Map$(comma),$(LDFLAGS)) _LIBS := $(filter -l%,$(LIBS)) _LIBS := $(patsubst -l%,$(OUTPUTDIR)Libs/lib%.so,$(_LIBS)) +ifeq ($(ARCHDIR),native) + LDFLAGS := $(patsubst -lc++,-lc++_acess,$(LDFLAGS)) + LIBS := $(patsubst -lc++,-lc++_acess,$(LIBS)) +endif ifeq ($(VERBOSE),) V := @ else @@ -47,7 +51,7 @@ install: $(_BIN) @$(xCP) $(_BIN)_ $(DISTROOT)/$(DIR)/$(BIN) @$(RM) $(_BIN)_ -$(_BIN): $(OUTPUTDIR)Libs/acess.ld $(_LIBS) $(LINK_OBJS) +$(_BIN): $(_LIBS) $(LINK_OBJS) $(CRT0) $(CRTI) $(CRTN) @mkdir -p $(dir $(_BIN)) @echo [LD] -o $@ ifneq ($(USE_CXX_LINK),)