From 194d1f0197b2ec99d5dc4d9f623fdb2e7bac7327 Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Thu, 26 Sep 2024 12:02:56 +0200 Subject: 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. --- CC/foreign/cmake/EXPRESSIONS | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'CC/foreign/cmake') diff --git a/CC/foreign/cmake/EXPRESSIONS b/CC/foreign/cmake/EXPRESSIONS index bf2385e..c8f6dc1 100644 --- a/CC/foreign/cmake/EXPRESSIONS +++ b/CC/foreign/cmake/EXPRESSIONS @@ -357,20 +357,11 @@ } , { "type": "join" , "$1": - [ "export PATH=\"$(./expand_exec TOOLCHAIN -- echo " + [ "export PATH=" , { "type": "join_cmd" , "$1": [{"type": "var", "name": "PATH"}] } - , ")${PATH:+:}${PATH}\"" - ] - } - , { "type": "join" - , "$1": - [ "export PATH=\"$(./expand_exec TOOLCHAIN -- echo " - , { "type": "join_cmd" - , "$1": [{"type": "var", "name": "PATH"}] - } - , ")${PATH:+:}${PATH}\"" + , "${PATH:+:}\"${PATH}\"" ] } ] -- cgit v1.2.3