diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-09-26 12:02:56 +0200 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-09-27 12:14:11 +0200 |
| commit | 194d1f0197b2ec99d5dc4d9f623fdb2e7bac7327 (patch) | |
| tree | 031612743c05635743089f4b76a6e006a5c94c38 /CC/foreign/shell/EXPRESSIONS | |
| parent | 38927e66d384c5fc639dba6d586d50a1ba746163 (diff) | |
| download | rules-cc-194d1f0197b2ec99d5dc4d9f623fdb2e7bac7327.tar.gz | |
Do not expand variables in PATH
... as otherwise we will use the same string in two ways: literal and as a value
to the expanded, making proper quoting impossible. Moreover, it is not
necessary to expand TOOLCHAIN: pointers into the toolchain can be passed
through the "bin dirs" part of the toolchain.
Diffstat (limited to 'CC/foreign/shell/EXPRESSIONS')
| -rw-r--r-- | CC/foreign/shell/EXPRESSIONS | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/CC/foreign/shell/EXPRESSIONS b/CC/foreign/shell/EXPRESSIONS index a0a9a00..a1dcd0c 100644 --- a/CC/foreign/shell/EXPRESSIONS +++ b/CC/foreign/shell/EXPRESSIONS @@ -18,7 +18,6 @@ , "PREFIX" , "BUILD_POSITION_INDEPENDENT" , "TIMEOUT_SCALE" - , "expand_exec" , "resolve_symlinks" ] , "imports": @@ -316,11 +315,11 @@ } , { "type": "join" , "$1": - [ "export PATH=\"$(./expand_exec TOOLCHAIN -- echo " + [ "export PATH=" , { "type": "join_cmd" , "$1": [{"type": "var", "name": "PATH"}] } - , ")${PATH:+:}${PATH}\"" + , "${PATH:+:}\"${PATH}\"" ] } ] @@ -349,7 +348,6 @@ , {"type": "var", "name": "work_dir"} , {"type": "var", "name": "localbase"} , {"type": "var", "name": "script"} - , {"type": "var", "name": "expand_exec"} ] } , "cmd": [{"type": "var", "name": "sh"}, "run_cmds.sh"] |