From bc5ed74e7fb2370d11f9c19828707ab8047e2ef4 Mon Sep 17 00:00:00 2001
From: NicJA <NicJA@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Thu, 13 Apr 2017 20:56:16 +0000
Subject: [PATCH] make sure kernel/host code also receives USER_ flags...

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@54501 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 config/make.tmpl | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/config/make.tmpl b/config/make.tmpl
index 9404d5c8c1..0770777687 100644
--- a/config/make.tmpl
+++ b/config/make.tmpl
@@ -318,8 +318,8 @@ BD_LINK ?= $(HOST_CC) $(HOST_LDFLAGS)
 BD_STRIP ?= $(HOST_STRIP)
 $(TMP_TARGETBASE).o : TMP_CMD:=$(HOST_CC)
 $(TMP_TARGETBASE).d : TMP_CMD:=$(HOST_CC)
-$(TMP_TARGETBASE).o : TMP_CFLAGS:=$(HOST_CFLAGS) $(TMP_CFLAGS)
-$(TMP_TARGETBASE).d : TMP_DFLAGS:=$(HOST_CFLAGS) $(TMP_DFLAGS)
+$(TMP_TARGETBASE).o : TMP_CFLAGS:=$(HOST_CFLAGS) $(TMP_CFLAGS) $(USER_CFLAGS) 
+$(TMP_TARGETBASE).d : TMP_DFLAGS:=$(HOST_CFLAGS) $(TMP_DFLAGS) $(USER_CFLAGS) 
 $(TMP_TARGETBASE).o : TMP_IQUOTE:=$(HOST_IQUOTE)
 $(TMP_TARGETBASE).d : TMP_IQUOTE:=$(HOST_IQUOTE)
 $(TMP_TARGETBASE).o : TMP_IQUOTE_END:=$(HOST_IQUOTE_END)
@@ -330,8 +330,8 @@ BD_LINK ?= $(KERNEL_CC) $(KERNEL_SYSROOT) $(KERNEL_LDFLAGS)
 BD_STRIP ?= $(ECHO) >/dev/null
 $(TMP_TARGETBASE).o : TMP_CMD:=$(KERNEL_CC) $(KERNEL_SYSROOT)
 $(TMP_TARGETBASE).d : TMP_CMD:=$(KERNEL_CC) $(KERNEL_SYSROOT)
-$(TMP_TARGETBASE).o : TMP_CFLAGS:=$(KERNEL_CFLAGS) $(TMP_CFLAGS)
-$(TMP_TARGETBASE).d : TMP_DFLAGS:=$(KERNEL_CFLAGS) $(TMP_DFLAGS)
+$(TMP_TARGETBASE).o : TMP_CFLAGS:=$(KERNEL_CFLAGS) $(TMP_CFLAGS) $(USER_CFLAGS) 
+$(TMP_TARGETBASE).d : TMP_DFLAGS:=$(KERNEL_CFLAGS) $(TMP_DFLAGS) $(USER_CFLAGS) 
 $(TMP_TARGETBASE).o : TMP_IQUOTE:=$(KERNEL_IQUOTE)
 $(TMP_TARGETBASE).d : TMP_IQUOTE:=$(KERNEL_IQUOTE)
 $(TMP_TARGETBASE).o : TMP_IQUOTE_END:=$(KERNEL_IQUOTE_END)
@@ -401,8 +401,8 @@ BD_LINK ?= $(HOST_CXX) $(HOST_LDFLAGS)
 BD_STRIP ?= $(HOST_STRIP)
 $(TMP_TARGETBASE).o : TMP_CMD:=$(HOST_CXX)
 $(TMP_TARGETBASE).d : TMP_CMD:=$(HOST_CXX)
-$(TMP_TARGETBASE).o : TMP_CXXFLAGS:=$(HOST_CXXFLAGS) $(TMP_CXXFLAGS)
-$(TMP_TARGETBASE).d : TMP_DXXFLAGS:=$(HOST_CXXFLAGS) $(TMP_DXXFLAGS)
+$(TMP_TARGETBASE).o : TMP_CXXFLAGS:=$(HOST_CXXFLAGS) $(TMP_CXXFLAGS) $(USER_CXXFLAGS) 
+$(TMP_TARGETBASE).d : TMP_DXXFLAGS:=$(HOST_CXXFLAGS) $(TMP_DXXFLAGS) $(USER_CXXFLAGS) 
 $(TMP_TARGETBASE).o : TMP_IQUOTE:=$(HOST_IQUOTE)
 $(TMP_TARGETBASE).d : TMP_IQUOTE:=$(HOST_IQUOTE)
 $(TMP_TARGETBASE).o : TMP_IQUOTE_END:=$(HOST_IQUOTE_END)
@@ -414,8 +414,8 @@ BD_LINK ?= $(KERNEL_CXX) $(KERNEL_SYSROOT) $(KERNEL_LDFLAGS)
 BD_STRIP ?= $(ECHO) >/dev/null
 $(TMP_TARGETBASE).o : TMP_CMD:=$(KERNEL_CXX) $(KERNEL_SYSROOT)
 $(TMP_TARGETBASE).d : TMP_CMD:=$(KERNEL_CXX) $(KERNEL_SYSROOT)
-$(TMP_TARGETBASE).o : TMP_CXXFLAGS:=$(KERNEL_CXXFLAGS) $(TMP_CXXFLAGS)
-$(TMP_TARGETBASE).d : TMP_DXXFLAGS:=$(KERNEL_CXXFLAGS) $(TMP_DXXFLAGS)
+$(TMP_TARGETBASE).o : TMP_CXXFLAGS:=$(KERNEL_CXXFLAGS) $(TMP_CXXFLAGS) $(USER_CXXFLAGS) 
+$(TMP_TARGETBASE).d : TMP_DXXFLAGS:=$(KERNEL_CXXFLAGS) $(TMP_DXXFLAGS) $(USER_CXXFLAGS) 
 $(TMP_TARGETBASE).o : TMP_IQUOTE:=$(KERNEL_IQUOTE)
 $(TMP_TARGETBASE).d : TMP_IQUOTE:=$(KERNEL_IQUOTE)
 $(TMP_TARGETBASE).o : TMP_IQUOTE_END:=$(KERNEL_IQUOTE_END)
@@ -497,8 +497,8 @@ BD_LINK ?= $(HOST_CC) $(HOST_LDFLAGS)
 BD_STRIP ?= $(HOST_STRIP)
 $(TMP_TARGETBASE).o : TMP_CMD:=$(HOST_CC)
 $(TMP_TARGETBASE).d : TMP_CMD:=$(HOST_CC)
-$(TMP_TARGETBASE).o : TMP_OBJCFLAGS:=$(HOST_CFLAGS) $(TMP_OBJCFLAGS)
-$(TMP_TARGETBASE).d : TMP_OBJCDFLAGS:=$(HOST_CFLAGS) $(TMP_OBJCDFLAGS)
+$(TMP_TARGETBASE).o : TMP_OBJCFLAGS:=$(HOST_CFLAGS) $(TMP_OBJCFLAGS) $(USER_CFLAGS)
+$(TMP_TARGETBASE).d : TMP_OBJCDFLAGS:=$(HOST_CFLAGS) $(TMP_OBJCDFLAGS) $(USER_CFLAGS)
 $(TMP_TARGETBASE).o : TMP_IQUOTE:=$(HOST_IQUOTE)
 $(TMP_TARGETBASE).d : TMP_IQUOTE:=$(HOST_IQUOTE)
 $(TMP_TARGETBASE).o : TMP_IQUOTE_END:=$(HOST_IQUOTE_END)
@@ -509,8 +509,8 @@ BD_LINK ?= $(KERNEL_CC) $(KERNEL_SYSROOT) $(KERNEL_LDFLAGS)
 BD_STRIP ?= $(ECHO) >/dev/null
 $(TMP_TARGETBASE).o : TMP_CMD:=$(KERNEL_CC) $(KERNEL_SYSROOT)
 $(TMP_TARGETBASE).d : TMP_CMD:=$(KERNEL_CC) $(KERNEL_SYSROOT)
-$(TMP_TARGETBASE).o : TMP_OBJCFLAGS:=$(KERNEL_CFLAGS) $(TMP_OBJCFLAGS)
-$(TMP_TARGETBASE).d : TMP_OBJCDFLAGS:=$(KERNEL_CFLAGS) $(TMP_OBJCDFLAGS)
+$(TMP_TARGETBASE).o : TMP_OBJCFLAGS:=$(KERNEL_CFLAGS) $(TMP_OBJCFLAGS) $(USER_CFLAGS)
+$(TMP_TARGETBASE).d : TMP_OBJCDFLAGS:=$(KERNEL_CFLAGS) $(TMP_OBJCDFLAGS) $(USER_CFLAGS)
 $(TMP_TARGETBASE).o : TMP_IQUOTE:=$(KERNEL_IQUOTE)
 $(TMP_TARGETBASE).d : TMP_IQUOTE:=$(KERNEL_IQUOTE)
 $(TMP_TARGETBASE).o : TMP_IQUOTE_END:=$(KERNEL_IQUOTE_END)
@@ -605,8 +605,8 @@ BD_LINK ?= $(HOST_CC) $(HOST_LDFLAGS)
 BD_STRIP ?= $(HOST_STRIP)
 BD_ASSEMBLER ?= $HOST_CC) $(HOST_SYSROOT)
 $(TMP_TARGETS) $(TMP_DTARGETS) : CMD:=$(HOST_CC)
-$(TMP_TARGETS) $(TMP_DTARGETS) : TMP_CFLAGS:=$(HOST_CFLAGS) $(TMP_CFLAGS)
-$(TMP_TARGETS) $(TMP_DTARGETS) : TMP_DFLAGS:=$(HOST_CFLAGS) $(TMP_DFLAGS)
+$(TMP_TARGETS) $(TMP_DTARGETS) : TMP_CFLAGS:=$(HOST_CFLAGS) $(TMP_CFLAGS) $(USER_CFLAGS)
+$(TMP_TARGETS) $(TMP_DTARGETS) : TMP_DFLAGS:=$(HOST_CFLAGS) $(TMP_DFLAGS) $(USER_CFLAGS)
 $(TMP_TARGETS) $(TMP_DTARGETS) : TMP_IQUOTE:=$(HOST_IQUOTE)
 $(TMP_TARGETS) $(TMP_DTARGETS) : TMP_IQUOTE_END:=$(HOST_IQUOTE_END)
 endif
@@ -615,8 +615,8 @@ BD_LINK ?= $(KERNEL_CC) $(KERNEL_SYSROOT) $(KERNEL_LDFLAGS)
 BD_STRIP ?= $(ECHO) >/dev/null
 BD_ASSEMBLER ?= $(KERNEL_CC) $(KERNEL_SYSROOT)
 $(TMP_TARGETS) $(TMP_DTARGETS) : CMD:=$(KERNEL_CC) $(KERNEL_SYSROOT)
-$(TMP_TARGETS) $(TMP_DTARGETS) : TMP_CFLAGS:=$(KERNEL_CFLAGS) $(TMP_CFLAGS)
-$(TMP_TARGETS) $(TMP_DTARGETS) : TMP_DFLAGS:=$(KERNEL_CFLAGS) $(TMP_DFLAGS)
+$(TMP_TARGETS) $(TMP_DTARGETS) : TMP_CFLAGS:=$(KERNEL_CFLAGS) $(TMP_CFLAGS) $(USER_CFLAGS)
+$(TMP_TARGETS) $(TMP_DTARGETS) : TMP_DFLAGS:=$(KERNEL_CFLAGS) $(TMP_DFLAGS) $(USER_CFLAGS)
 $(TMP_TARGETS) $(TMP_DTARGETS) : TMP_IQUOTE:=$(KERNEL_IQUOTE)
 $(TMP_TARGETS) $(TMP_DTARGETS) : TMP_IQUOTE_END:=$(KERNEL_IQUOTE_END)
 endif
@@ -688,8 +688,8 @@ ifeq (%(compiler),host)
   BD_STRIP ?= $(HOST_STRIP)
   BD_ASSEMBLER ?= $(HOST_CC) $(HOST_SYSROOT)
   TMP_CXXCMD:=$(HOST_CXX)
-  TMP_CXXFLAGS := $(HOST_CXXFLAGS) $(TMP_CXXFLAGS)
-  TMP_DXXFLAGS := $(HOST_CXXFLAGS) $(TMP_DXXFLAGS)
+  TMP_CXXFLAGS := $(HOST_CXXFLAGS) $(TMP_CXXFLAGS) $(USER_CXXFLAGS) 
+  TMP_DXXFLAGS := $(HOST_CXXFLAGS) $(TMP_DXXFLAGS) $(USER_CXXFLAGS) 
   TMP_CXXIQUOTE:=$(HOST_IQUOTE)
   TMP_CXXIQUOTE_END:=$(HOST_IQUOTE_END)
 endif
@@ -709,8 +709,8 @@ ifeq (%(compiler),kernel)
   BD_STRIP ?= $(ECHO) >/dev/null
   BD_ASSEMBLER ?= $(KERNEL_CC) $(KERNEL_SYSROOT)
   TMP_CXXCMD:=$(KERNEL_CXX) $(KERNEL_SYSROOT)
-  TMP_CXXFLAGS := $(KERNEL_CXXFLAGS) $(TMP_CXXFLAGS)
-  TMP_DXXFLAGS := $(KERNEL_CXXFLAGS) $(TMP_DXXFLAGS)
+  TMP_CXXFLAGS := $(KERNEL_CXXFLAGS) $(TMP_CXXFLAGS) $(USER_CXXFLAGS) 
+  TMP_DXXFLAGS := $(KERNEL_CXXFLAGS) $(TMP_DXXFLAGS) $(USER_CXXFLAGS) 
   TMP_CXXIQUOTE:=$(KERNEL_IQUOTE)
   TMP_CXXIQUOTE_END:=$(KERNEL_IQUOTE_END)
 endif
@@ -811,8 +811,8 @@ ifeq (%(compiler),host)
   BD_STRIP ?= $(HOST_STRIP)
   BD_ASSEMBLER ?= $(HOST_CC) $(HOST_SYSROOT)
   $(TMP_TARGETS) $(TMP_DTARGETS) : CMD:=$(HOST_OBJC)
-  $(TMP_TARGETS) $(TMP_DTARGETS) : TMP_OBJCFLAGS:=$(HOST_CFLAGS) $(TMP_OBJCFLAGS)
-  $(TMP_TARGETS) $(TMP_DTARGETS) : TMP_OBJCDFLAGS:=$(HOST_CFLAGS) $(TMP_OBJCDFLAGS)
+  $(TMP_TARGETS) $(TMP_DTARGETS) : TMP_OBJCFLAGS:=$(HOST_CFLAGS) $(TMP_OBJCFLAGS) $(USER_CFLAGS) 
+  $(TMP_TARGETS) $(TMP_DTARGETS) : TMP_OBJCDFLAGS:=$(HOST_CFLAGS) $(TMP_OBJCDFLAGS) $(USER_CFLAGS) 
   $(TMP_TARGETS) $(TMP_DTARGETS) : TMP_IQUOTE:=$(HOST_IQUOTE)
   $(TMP_TARGETS) $(TMP_DTARGETS) : TMP_IQUOTE_END:=$(HOST_IQUOTE_END)
 endif
@@ -822,8 +822,8 @@ ifeq (%(compiler),kernel)
   BD_STRIP ?= $(ECHO) >/dev/null
   BD_ASSEMBLER ?= $(KERNEL_CC) $(KERNEL_SYSROOT)
   $(TMP_TARGETS) $(TMP_DTARGETS) : CMD:=$(KERNEL_OBJC) $(KERNEL_SYSROOT)
-  $(TMP_TARGETS) $(TMP_DTARGETS) : TMP_OBJCFLAGS:=$(KERNEL_CFLAGS) $(TMP_OBJCFLAGS)
-  $(TMP_TARGETS) $(TMP_DTARGETS) : TMP_OBJCDFLAGS:=$(KERNEL_CFLAGS) $(TMP_OBJCDFLAGS)
+  $(TMP_TARGETS) $(TMP_DTARGETS) : TMP_OBJCFLAGS:=$(KERNEL_CFLAGS) $(TMP_OBJCFLAGS) $(USER_CFLAGS) 
+  $(TMP_TARGETS) $(TMP_DTARGETS) : TMP_OBJCDFLAGS:=$(KERNEL_CFLAGS) $(TMP_OBJCDFLAGS) $(USER_CFLAGS) 
   $(TMP_TARGETS) $(TMP_DTARGETS) : TMP_IQUOTE:=$(KERNEL_IQUOTE)
   $(TMP_TARGETS) $(TMP_DTARGETS) : TMP_IQUOTE_END:=$(KERNEL_IQUOTE_END)
 endif
-- 
2.11.4.GIT