From 231b991edcf3853486e613c8c6fad0981a4af272 Mon Sep 17 00:00:00 2001
From: Oliver Reiche <oliver.reiche@huawei.com>
Date: Thu, 4 Apr 2024 11:52:05 +0200
Subject: Fix PATH of top-level toolchains

... which not only requires "/bin" (for "sh") but also
"/usr/bin" for coreutils ("dirname", "realpath", "chmod",
etc.), which are needed for compiler wrappers and the patch
runner script.
---
 toolchains/CC/clang.TARGETS      | 2 +-
 toolchains/CC/gcc.TARGETS        | 2 +-
 toolchains/patch/busybox.TARGETS | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/toolchains/CC/clang.TARGETS b/toolchains/CC/clang.TARGETS
index bcea8e4..d482b54 100644
--- a/toolchains/CC/clang.TARGETS
+++ b/toolchains/CC/clang.TARGETS
@@ -83,7 +83,7 @@
       }
     }
   , "toolchain": ["staged-clang"]
-  , "PATH": ["$(TOOLCHAIN)/clang/bin", "/bin"]
+  , "PATH": ["$(TOOLCHAIN)/clang/bin", "/bin", "/usr/bin"]
   }
 , "staged-clang": {"type": "install", "dirs": [[["", "toolchain"], "clang"]]}
 }
diff --git a/toolchains/CC/gcc.TARGETS b/toolchains/CC/gcc.TARGETS
index c0b6fbe..9f0fbc0 100644
--- a/toolchains/CC/gcc.TARGETS
+++ b/toolchains/CC/gcc.TARGETS
@@ -32,7 +32,7 @@
     , "else": [["@", "gcc", "", "runlibs"]]
     }
   , "toolchain": ["staged-gcc"]
-  , "PATH": ["$(TOOLCHAIN)/gcc/bin", "/bin"]
+  , "PATH": ["$(TOOLCHAIN)/gcc/bin", "/bin", "/usr/bin"]
   }
 , "staged-gcc": {"type": "install", "dirs": [[["", "toolchain"], "gcc"]]}
 }
diff --git a/toolchains/patch/busybox.TARGETS b/toolchains/patch/busybox.TARGETS
index 5581cb7..e027085 100644
--- a/toolchains/patch/busybox.TARGETS
+++ b/toolchains/patch/busybox.TARGETS
@@ -2,7 +2,7 @@
   { "type": ["@", "rules", "patch", "defaults"]
   , "PATCH": ["busybox/usr/bin/patch"]
   , "toolchain": ["staged-busybox"]
-  , "PATH": ["/bin"]
+  , "PATH": ["/bin", "/usr/bin"]
   }
 , "staged-busybox":
   {"type": "install", "dirs": [[["", "toolchain"], "busybox"]]}
-- 
cgit v1.2.3