diff options
author | Oliver Reiche <oliver.reiche@huawei.com> | 2023-08-16 15:38:38 +0200 |
---|---|---|
committer | Oliver Reiche <oliver.reiche@huawei.com> | 2023-08-16 15:38:38 +0200 |
commit | 22a280141becf3e41652368794b2a815390c7472 (patch) | |
tree | d423afe5535bf9262725e6a2488ba18e37dbd615 /rules/CC/auto | |
parent | cdca4eff0264795d4c36fcb89aaf174a2a4151bd (diff) | |
parent | 54bb2a33b3e36123f8f411f77ec8e76f5b021e3d (diff) | |
download | rules-cc-22a280141becf3e41652368794b2a815390c7472.tar.gz |
Merge commit '54bb2a33b3e36123f8f411f77ec8e76f5b021e3d' into rules/rules-cc
Diffstat (limited to 'rules/CC/auto')
-rw-r--r-- | rules/CC/auto/RULES | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/rules/CC/auto/RULES b/rules/CC/auto/RULES index 247ee01..0e156c9 100644 --- a/rules/CC/auto/RULES +++ b/rules/CC/auto/RULES @@ -156,6 +156,7 @@ , "flags-cc": ["./", "..", "flags-cc"] , "flags-cxx": ["./", "..", "flags-cxx"] , "default-ENV": ["./", "..", "default-ENV"] + , "default-PATH": ["./", "..", "default-PATH"] , "default-TOOLCHAIN": ["./", "..", "default-TOOLCHAIN"] , "default-NON_SYSTEM_TOOLS": ["./", "..", "default-NON_SYSTEM_TOOLS"] } @@ -222,6 +223,36 @@ ] } ] + , [ "ENV_PATH" + , { "type": "lookup" + , "map": {"type": "var", "name": "ENV"} + , "key": "PATH" + } + ] + , [ "ENV" + , { "type": "map_union" + , "$1": + [ {"type": "var", "name": "ENV"} + , { "type": "singleton_map" + , "key": "PATH" + , "value": + { "type": "join" + , "separator": ":" + , "$1": + { "type": "++" + , "$1": + [ {"type": "CALL_EXPRESSION", "name": "default-PATH"} + , { "type": "if" + , "cond": {"type": "var", "name": "ENV_PATH"} + , "then": [{"type": "var", "name": "ENV_PATH"}] + } + ] + } + } + } + ] + } + ] , [ "c.flags" , { "type": "BLOB" , "data": |