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/foreign/cmake/EXPRESSIONS | |
| parent | cdca4eff0264795d4c36fcb89aaf174a2a4151bd (diff) | |
| parent | 54bb2a33b3e36123f8f411f77ec8e76f5b021e3d (diff) | |
| download | rules-cc-22a280141becf3e41652368794b2a815390c7472.tar.gz | |
Merge commit '54bb2a33b3e36123f8f411f77ec8e76f5b021e3d' into rules/rules-cc
Diffstat (limited to 'rules/CC/foreign/cmake/EXPRESSIONS')
| -rw-r--r-- | rules/CC/foreign/cmake/EXPRESSIONS | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/rules/CC/foreign/cmake/EXPRESSIONS b/rules/CC/foreign/cmake/EXPRESSIONS index 2266f61..ac7039c 100644 --- a/rules/CC/foreign/cmake/EXPRESSIONS +++ b/rules/CC/foreign/cmake/EXPRESSIONS @@ -27,6 +27,7 @@ ] , "imports": { "artifacts": ["", "field_artifacts"] + , "nub_left": ["", "nub_left"] , "flags-cc": ["CC", "flags-cc"] , "flags-cxx": ["CC", "flags-cxx"] , "compiler-cc": ["CC", "compiler-cc"] @@ -34,6 +35,7 @@ , "default-LDFLAGS": ["CC", "default-LDFLAGS"] , "default-AR": ["CC", "default-AR"] , "default-ENV": ["CC", "default-ENV"] + , "default-PATH": ["CC", "default-PATH"] , "default-TOOLCHAIN": ["CC", "default-TOOLCHAIN"] , "default-NON_SYSTEM_TOOLS": ["CC", "default-NON_SYSTEM_TOOLS"] , "expand_exec_tool": ["./", "..", "expand_exec_tool"] @@ -136,14 +138,25 @@ } } ] + , [ "PATH" + , { "type": "join" + , "separator": ":" + , "$1": + { "type": "let*" + , "bindings": + [["list", {"type": "CALL_EXPRESSION", "name": "default-PATH"}]] + , "body": {"type": "CALL_EXPRESSION", "name": "nub_left"} + } + } + ] , [ "ENV" , { "type": "map_union" , "$1": - [ {"type": "CALL_EXPRESSION", "name": "default-ENV"} - , {"type": "var", "name": "ENV", "default": {"type": "empty_map"}} - , { "type": "env" + [ { "type": "env" , "vars": ["CC", "CXX", "CXXFLAGS", "CFLAGS", "LDFLAGS", "AR"] } + , {"type": "CALL_EXPRESSION", "name": "default-ENV"} + , {"type": "var", "name": "ENV", "default": {"type": "empty_map"}} ] } ] @@ -190,7 +203,17 @@ , "mkdir scratch" , "readonly ROOT=\"$(pwd)\"" , "export TMPDIR=\"$(pwd)/scratch\"" + , "export TOOLCHAIN=\"$(pwd)/toolchain\"" , "export LOCALBASE=\"$(pwd)/localbase\"" + , { "type": "join" + , "$1": + [ "export PATH=\"$(./expand_exec TOOLCHAIN -- echo " + , { "type": "join_cmd" + , "$1": [{"type": "var", "name": "PATH"}] + } + , ")\":$PATH" + ] + } ] , { "type": "if" , "cond": {"type": "var", "name": "pre_cmds"} |