From 1bb926aaabc4d948940b8436d0050e6820a4f213 Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Thu, 26 Sep 2024 11:35:01 +0200 Subject: Drop wrong and unneed toolchain reference in defaults target The "PATH" field in ["CC", "defaults"] is taken literally (currently outside the foreign rules, in the future everywhere), so a reference to the toolchain does not work. However, it is not necessary either, so simply drop it. --- etc/defaults/CC/clang.TARGETS | 2 +- etc/defaults/CC/gcc.TARGETS | 2 +- etc/defaults/CC/stage-1.TARGETS | 2 +- etc/defaults/CC/tools.TARGETS | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'etc/defaults') diff --git a/etc/defaults/CC/clang.TARGETS b/etc/defaults/CC/clang.TARGETS index a91fced..f89f1ed 100644 --- a/etc/defaults/CC/clang.TARGETS +++ b/etc/defaults/CC/clang.TARGETS @@ -4,7 +4,7 @@ , "CXX": ["gcc/bin/g++"] , "AR": ["gcc/bin/ar"] , "toolchain": ["staged-gcc"] - , "PATH": ["$(TOOLCHAIN)/gcc/bin", "/bin", "/usr/bin"] + , "PATH": ["/bin", "/usr/bin"] } , "staged-gcc": {"type": "install", "dirs": [[["@", "gcc", "", "toolchain"], "gcc"]]} diff --git a/etc/defaults/CC/gcc.TARGETS b/etc/defaults/CC/gcc.TARGETS index a91fced..f89f1ed 100644 --- a/etc/defaults/CC/gcc.TARGETS +++ b/etc/defaults/CC/gcc.TARGETS @@ -4,7 +4,7 @@ , "CXX": ["gcc/bin/g++"] , "AR": ["gcc/bin/ar"] , "toolchain": ["staged-gcc"] - , "PATH": ["$(TOOLCHAIN)/gcc/bin", "/bin", "/usr/bin"] + , "PATH": ["/bin", "/usr/bin"] } , "staged-gcc": {"type": "install", "dirs": [[["@", "gcc", "", "toolchain"], "gcc"]]} diff --git a/etc/defaults/CC/stage-1.TARGETS b/etc/defaults/CC/stage-1.TARGETS index a91fced..f89f1ed 100644 --- a/etc/defaults/CC/stage-1.TARGETS +++ b/etc/defaults/CC/stage-1.TARGETS @@ -4,7 +4,7 @@ , "CXX": ["gcc/bin/g++"] , "AR": ["gcc/bin/ar"] , "toolchain": ["staged-gcc"] - , "PATH": ["$(TOOLCHAIN)/gcc/bin", "/bin", "/usr/bin"] + , "PATH": ["/bin", "/usr/bin"] } , "staged-gcc": {"type": "install", "dirs": [[["@", "gcc", "", "toolchain"], "gcc"]]} diff --git a/etc/defaults/CC/tools.TARGETS b/etc/defaults/CC/tools.TARGETS index 08eb7b0..d252852 100644 --- a/etc/defaults/CC/tools.TARGETS +++ b/etc/defaults/CC/tools.TARGETS @@ -5,7 +5,7 @@ , "AR": ["gcc/bin/ar"] , "LDFLAGS": ["-static", "-l:mimalloc.o"] , "toolchain": ["staged-gcc"] - , "PATH": ["$(TOOLCHAIN)/gcc/bin", "/bin", "/usr/bin"] + , "PATH": ["/bin", "/usr/bin"] } , "staged-gcc": {"type": "install", "dirs": [[["@", "gcc-musl", "", "toolchain"], "gcc"]]} -- cgit v1.2.3