From 041837b64c46aaed005472c9f232b5254bf8d8e8 Mon Sep 17 00:00:00 2001
From: rexy712 <rexy712@protonmail.com>
Date: Sat, 19 Jun 2021 06:48:19 -0700
Subject: [PATCH] Fix linkflag saving not including LDLIBS

---
 makefile.basic     | 6 ++++--
 makefile.library   | 6 ++++--
 makefile.reclib    | 6 ++++--
 makefile.recursive | 6 ++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/makefile.basic b/makefile.basic
index 0704eaa..25ac91e 100644
--- a/makefile.basic
+++ b/makefile.basic
@@ -151,9 +151,11 @@ ALL_COMPILEFLAGS=$(COMPILER_FLAGS) $(INTERNAL_COMPILERFLAGS)
 ifeq ($(RELEASE),1)
 	ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS)
 	ALL_LDLIBS=$(LDLIBS)
+	ALL_LINK_FLAGS_LIBS=$(ALL_LINKFLAGS) $(ALL_LDLIBS)
 else
 	ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS) $(DEBUG_LDFLAGS)
 	ALL_LDLIBS=$(LDLIBS) $(DEBUG_LDLIBS)
+	ALL_LINK_FLAGS_LIBS=$(ALL_LINKFLAGS) $(ALL_LDLIBS)
 endif
 #just a variable for a newline
 define \n
@@ -170,10 +172,10 @@ else
 $(CFLAGS_TMPFILE):
 endif
 
-ifneq ($(ALL_LINKFLAGS),$(OLD_LINKFLAGS))
+ifneq ($(ALL_LINK_FLAGS_LIBS),$(OLD_LINKFLAGS))
 .PHONY: $(LDFLAGS_TMPFILE)
 $(LDFLAGS_TMPFILE):
-	$(file >$(LDFLAGS_TMPFILE),$(ALL_LINKFLAGS))
+	$(file >$(LDFLAGS_TMPFILE),$(ALL_LINK_FLAGS_LIBS))
 else
 $(LDFLAGS_TMPFILE):
 endif
diff --git a/makefile.library b/makefile.library
index cd668d3..5ec75a8 100644
--- a/makefile.library
+++ b/makefile.library
@@ -168,9 +168,11 @@ ALL_COMPILEFLAGS=$(COMPILER_FLAGS) $(INTERNAL_COMPILERFLAGS)
 ifeq ($(RELEASE),1)
 	ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS)
 	ALL_LDLIBS=$(LDLIBS)
+	ALL_LINK_FLAGS_LIBS=$(ALL_LINKFLAGS) $(ALL_LDLIBS)
 else
 	ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS) $(DEBUG_LDFLAGS)
 	ALL_LDLIBS=$(LDLIBS) $(DEBUG_LDLIBS)
+	ALL_LINK_FLAGS_LIBS=$(ALL_LINKFLAGS) $(ALL_LDLIBS)
 endif
 
 ifeq ($(SAVEFLAGS),1)
@@ -182,10 +184,10 @@ else
 $(CFLAGS_TMPFILE):
 endif
 
-ifneq ($(ALL_LINKFLAGS),$(OLD_LINKFLAGS))
+ifneq ($(ALL_LINK_FLAGS_LIBS),$(OLD_LINKFLAGS))
 .PHONY: $(LDFLAGS_TMPFILE)
 $(LDFLAGS_TMPFILE):
-	$(file >$(LDFLAGS_TMPFILE),$(ALL_LINKFLAGS))
+	$(file >$(LDFLAGS_TMPFILE),$(ALL_LINK_FLAGS_LIBS))
 else
 $(LDFLAGS_TMPFILE):
 endif
diff --git a/makefile.reclib b/makefile.reclib
index 87c432e..a86eb7b 100644
--- a/makefile.reclib
+++ b/makefile.reclib
@@ -163,9 +163,11 @@ ALL_COMPILEFLAGS=$(COMPILER_FLAGS) $(INTERNAL_COMPILERFLAGS)
 ifeq ($(RELEASE),1)
 	ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS)
 	ALL_LDLIBS=$(LDLIBS)
+	ALL_LINK_FLAGS_LIBS=$(ALL_LINKFLAGS) $(ALL_LDLIBS)
 else
 	ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS) $(DEBUG_LDFLAGS)
 	ALL_LDLIBS=$(LDLIBS) $(DEBUG_LDLIBS)
+	ALL_LINK_FLAGS_LIBS=$(ALL_LINKFLAGS) $(ALL_LDLIBS)
 endif
 
 #Arguments to make submake use this makefile without "Entering directory" stuff
@@ -186,8 +188,8 @@ endif
 .PHONY: ldflags-update
 ldflags-update:
 ifeq ($(SAVEFLAGS),1)
-ifneq ($(ALL_LINKFLAGS),$(OLD_LINKFLAGS))
-	$(file >$(LDFLAGS_TMPFILE),$(ALL_LINKFLAGS))
+ifneq ($(ALL_LINK_FLAGS_LIBS),$(OLD_LINKFLAGS))
+	$(file >$(LDFLAGS_TMPFILE),$(ALL_LINK_FLAGS_LIBS))
 endif
 endif
 .PHONY: flags-update
diff --git a/makefile.recursive b/makefile.recursive
index 303d703..2dc76eb 100644
--- a/makefile.recursive
+++ b/makefile.recursive
@@ -148,9 +148,11 @@ ALL_COMPILEFLAGS=$(COMPILER_FLAGS) $(INTERNAL_COMPILERFLAGS)
 ifeq ($(RELEASE),1)
 	ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS)
 	ALL_LDLIBS=$(LDLIBS)
+	ALL_LINK_FLAGS_LIBS=$(ALL_LINKFLAGS) $(ALL_LDLIBS)
 else
 	ALL_LINKFLAGS=$(INTERNAL_LINKFLAGS) $(LDFLAGS) $(DEBUG_LDFLAGS)
 	ALL_LDLIBS=$(LDLIBS) $(DEBUG_LDLIBS)
+	ALL_LINK_FLAGS_LIBS=$(ALL_LINKFLAGS) $(ALL_LDLIBS)
 endif
 
 #Arguments to make submake use this makefile without "Entering directory" stuff
@@ -171,8 +173,8 @@ endif
 .PHONY: ldflags-update
 ldflags-update:
 ifeq ($(SAVEFLAGS),1)
-ifneq ($(ALL_LINKFLAGS),$(OLD_LINKFLAGS))
-	$(file >$(LDFLAGS_TMPFILE),$(ALL_LINKFLAGS))
+ifneq ($(ALL_LINKFLAGS),$(OLD_LINK_FLAGS_LIBS))
+	$(file >$(LDFLAGS_TMPFILE),$(ALL_LINK_FLAGS_LIBS))
 endif
 endif
 .PHONY: flags-update