From 194d1f0197b2ec99d5dc4d9f623fdb2e7bac7327 Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <klaus.aehlig@huawei.com>
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/shell/EXPRESSIONS | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'CC/foreign/shell/EXPRESSIONS')

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"]
-- 
cgit v1.2.3