From a513b2e823dc6a2e37ae1fad6924b3d5c34dabf0 Mon Sep 17 00:00:00 2001
From: Oliver Reiche <oliver.reiche@huawei.com>
Date: Thu, 16 Nov 2023 16:41:38 +0100
Subject: rules: Fix flag inheritance

... which should accumulate values from all base targets
unless the flag type (CFLAGS, CXXFLAGS, or LDFLAGS) is
explicity overwritten by the inheritor.
---
 CC/RULES | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'CC/RULES')

diff --git a/CC/RULES b/CC/RULES
index bea41d2..0c5021c 100644
--- a/CC/RULES
+++ b/CC/RULES
@@ -75,6 +75,7 @@
   , "config_vars": ["ARCH", "HOST_ARCH", "TARGET_ARCH"]
   , "imports":
     { "base-provides": "defaults-base-provides"
+    , "base-provides-++": "defaults-base-provides-++"
     , "base-provides-list": "defaults-base-provides-list"
     , "artifacts_list": ["./", "..", "field_artifacts_list"]
     , "nub_left": ["", "nub_left"]
@@ -119,7 +120,7 @@
         , { "type": "if"
           , "cond": {"type": "var", "name": "CFLAGS"}
           , "then": {"type": "var", "name": "CFLAGS"}
-          , "else": {"type": "CALL_EXPRESSION", "name": "base-provides"}
+          , "else": {"type": "CALL_EXPRESSION", "name": "base-provides-++"}
           }
         ]
       , ["provider", "CXXFLAGS"]
@@ -127,7 +128,7 @@
         , { "type": "if"
           , "cond": {"type": "var", "name": "CXXFLAGS"}
           , "then": {"type": "var", "name": "CXXFLAGS"}
-          , "else": {"type": "CALL_EXPRESSION", "name": "base-provides"}
+          , "else": {"type": "CALL_EXPRESSION", "name": "base-provides-++"}
           }
         ]
       , ["provider", "LDFLAGS"]
@@ -135,7 +136,7 @@
         , { "type": "if"
           , "cond": {"type": "var", "name": "LDFLAGS"}
           , "then": {"type": "var", "name": "LDFLAGS"}
-          , "else": {"type": "CALL_EXPRESSION", "name": "base-provides"}
+          , "else": {"type": "CALL_EXPRESSION", "name": "base-provides-++"}
           }
         ]
       , ["provider", "AR"]
@@ -151,9 +152,7 @@
         , { "type": "++"
           , "$1":
             [ {"type": "var", "name": "PATH"}
-            , { "type": "++"
-              , "$1": {"type": "CALL_EXPRESSION", "name": "base-provides-list"}
-              }
+            , {"type": "CALL_EXPRESSION", "name": "base-provides-++"}
             ]
           }
         ]
-- 
cgit v1.2.3