diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2023-11-20 16:03:21 +0100 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2023-11-20 16:03:21 +0100 |
| commit | 65e841f4cb062c77fc6cb14e7283cb0c7a1f0bb8 (patch) | |
| tree | e7d9a912c304c030ad48637a82f2f513a83c1150 /rules/CC/RULES | |
| parent | b4dccdd9e27bb570e1d411f8238e4ed0c89e8e1b (diff) | |
| parent | 96f7a9f47ee4dafccced87e44f98afa3f14a3df9 (diff) | |
| download | rules-cc-65e841f4cb062c77fc6cb14e7283cb0c7a1f0bb8.tar.gz | |
Merge subtree 'rules' into rules-cc
Diffstat (limited to 'rules/CC/RULES')
| -rw-r--r-- | rules/CC/RULES | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/rules/CC/RULES b/rules/CC/RULES index c6426b1..230c397 100644 --- a/rules/CC/RULES +++ b/rules/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"] @@ -121,7 +122,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"] @@ -129,7 +130,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"] @@ -137,7 +138,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"] @@ -153,9 +154,7 @@ , { "type": "++" , "$1": [ {"type": "var", "name": "PATH"} - , { "type": "++" - , "$1": {"type": "CALL_EXPRESSION", "name": "base-provides-list"} - } + , {"type": "CALL_EXPRESSION", "name": "base-provides-++"} ] } ] |