rexy712/makefile
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix linkflag saving not including LDLIBS

Browse Source
This commit is contained in:
rexy712 2021-06-19 06:48:19 -07:00
parent 02b18bd3ac
commit 041837b64c
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makefile.basic
View File

@ -151,9 +151,11 @@ ALL_COMPILEFLAGS=$(COMPILER_FLAGS) $(INTERNAL_COMPILERFLAGS)
ifeq ($(RELEASE),1) ifeq ($(RELEASE),1)
ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS) ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS)
ALL_LDLIBS=$(LDLIBS) ALL_LDLIBS=$(LDLIBS)
ALL_LINK_FLAGS_LIBS=$(ALL_LINKFLAGS) $(ALL_LDLIBS)
else else
ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS) $(DEBUG_LDFLAGS) ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS) $(DEBUG_LDFLAGS)
ALL_LDLIBS=$(LDLIBS) $(DEBUG_LDLIBS) ALL_LDLIBS=$(LDLIBS) $(DEBUG_LDLIBS)
ALL_LINK_FLAGS_LIBS=$(ALL_LINKFLAGS) $(ALL_LDLIBS)
endif endif
#just a variable for a newline #just a variable for a newline
define \n define \n
@ -170,10 +172,10 @@ else
$(CFLAGS_TMPFILE): $(CFLAGS_TMPFILE):
endif endif
ifneq ($(ALL_LINKFLAGS),$(OLD_LINKFLAGS)) ifneq ($(ALL_LINK_FLAGS_LIBS),$(OLD_LINKFLAGS))
.PHONY: $(LDFLAGS_TMPFILE) .PHONY: $(LDFLAGS_TMPFILE)
$(LDFLAGS_TMPFILE): $(LDFLAGS_TMPFILE):
$(file >$(LDFLAGS_TMPFILE),$(ALL_LINKFLAGS)) $(file >$(LDFLAGS_TMPFILE),$(ALL_LINK_FLAGS_LIBS))
else else
$(LDFLAGS_TMPFILE): $(LDFLAGS_TMPFILE):
endif endif

6
makefile.library
View File

@ -168,9 +168,11 @@ ALL_COMPILEFLAGS=$(COMPILER_FLAGS) $(INTERNAL_COMPILERFLAGS)
ifeq ($(RELEASE),1) ifeq ($(RELEASE),1)
ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS) ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS)
ALL_LDLIBS=$(LDLIBS) ALL_LDLIBS=$(LDLIBS)
ALL_LINK_FLAGS_LIBS=$(ALL_LINKFLAGS) $(ALL_LDLIBS)
else else
ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS) $(DEBUG_LDFLAGS) ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS) $(DEBUG_LDFLAGS)
ALL_LDLIBS=$(LDLIBS) $(DEBUG_LDLIBS) ALL_LDLIBS=$(LDLIBS) $(DEBUG_LDLIBS)
ALL_LINK_FLAGS_LIBS=$(ALL_LINKFLAGS) $(ALL_LDLIBS)
endif endif
ifeq ($(SAVEFLAGS),1) ifeq ($(SAVEFLAGS),1)
@ -182,10 +184,10 @@ else
$(CFLAGS_TMPFILE): $(CFLAGS_TMPFILE):
endif endif
ifneq ($(ALL_LINKFLAGS),$(OLD_LINKFLAGS)) ifneq ($(ALL_LINK_FLAGS_LIBS),$(OLD_LINKFLAGS))
.PHONY: $(LDFLAGS_TMPFILE) .PHONY: $(LDFLAGS_TMPFILE)
$(LDFLAGS_TMPFILE): $(LDFLAGS_TMPFILE):
$(file >$(LDFLAGS_TMPFILE),$(ALL_LINKFLAGS)) $(file >$(LDFLAGS_TMPFILE),$(ALL_LINK_FLAGS_LIBS))
else else
$(LDFLAGS_TMPFILE): $(LDFLAGS_TMPFILE):
endif endif

6
makefile.reclib
View File

@ -163,9 +163,11 @@ ALL_COMPILEFLAGS=$(COMPILER_FLAGS) $(INTERNAL_COMPILERFLAGS)
ifeq ($(RELEASE),1) ifeq ($(RELEASE),1)
ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS) ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS)
ALL_LDLIBS=$(LDLIBS) ALL_LDLIBS=$(LDLIBS)
ALL_LINK_FLAGS_LIBS=$(ALL_LINKFLAGS) $(ALL_LDLIBS)
else else
ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS) $(DEBUG_LDFLAGS) ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS) $(DEBUG_LDFLAGS)
ALL_LDLIBS=$(LDLIBS) $(DEBUG_LDLIBS) ALL_LDLIBS=$(LDLIBS) $(DEBUG_LDLIBS)
ALL_LINK_FLAGS_LIBS=$(ALL_LINKFLAGS) $(ALL_LDLIBS)
endif endif
#Arguments to make submake use this makefile without "Entering directory" stuff #Arguments to make submake use this makefile without "Entering directory" stuff
@ -186,8 +188,8 @@ endif
.PHONY: ldflags-update .PHONY: ldflags-update
ldflags-update: ldflags-update:
ifeq ($(SAVEFLAGS),1) ifeq ($(SAVEFLAGS),1)
ifneq ($(ALL_LINKFLAGS),$(OLD_LINKFLAGS)) ifneq ($(ALL_LINK_FLAGS_LIBS),$(OLD_LINKFLAGS))
$(file >$(LDFLAGS_TMPFILE),$(ALL_LINKFLAGS)) $(file >$(LDFLAGS_TMPFILE),$(ALL_LINK_FLAGS_LIBS))
endif endif
endif endif
.PHONY: flags-update .PHONY: flags-update

6
makefile.recursive
View File

@ -148,9 +148,11 @@ ALL_COMPILEFLAGS=$(COMPILER_FLAGS) $(INTERNAL_COMPILERFLAGS)
ifeq ($(RELEASE),1) ifeq ($(RELEASE),1)
ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS) ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS)
ALL_LDLIBS=$(LDLIBS) ALL_LDLIBS=$(LDLIBS)
ALL_LINK_FLAGS_LIBS=$(ALL_LINKFLAGS) $(ALL_LDLIBS)
else else
ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS) $(DEBUG_LDFLAGS) ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS) $(DEBUG_LDFLAGS)
ALL_LDLIBS=$(LDLIBS) $(DEBUG_LDLIBS) ALL_LDLIBS=$(LDLIBS) $(DEBUG_LDLIBS)
ALL_LINK_FLAGS_LIBS=$(ALL_LINKFLAGS) $(ALL_LDLIBS)
endif endif
#Arguments to make submake use this makefile without "Entering directory" stuff #Arguments to make submake use this makefile without "Entering directory" stuff
@ -171,8 +173,8 @@ endif
.PHONY: ldflags-update .PHONY: ldflags-update
ldflags-update: ldflags-update:
ifeq ($(SAVEFLAGS),1) ifeq ($(SAVEFLAGS),1)
ifneq ($(ALL_LINKFLAGS),$(OLD_LINKFLAGS)) ifneq ($(ALL_LINKFLAGS),$(OLD_LINK_FLAGS_LIBS))
$(file >$(LDFLAGS_TMPFILE),$(ALL_LINKFLAGS)) $(file >$(LDFLAGS_TMPFILE),$(ALL_LINK_FLAGS_LIBS))
endif endif
endif endif
.PHONY: flags-update .PHONY: flags-update