From d77f5f3e70e404cabb39c1b8efde92fa83ba5835 Mon Sep 17 00:00:00 2001 From: Oliver Reiche Date: Tue, 9 Jan 2024 16:11:15 +0100 Subject: repos: Refactor rules/static-build to rules/tools ... as those rules are only used by tools. --- etc/defaults/CC/foreign/static-build.TARGETS | 15 --------------- etc/defaults/CC/foreign/tools.TARGETS | 15 +++++++++++++++ etc/defaults/CC/static-build.TARGETS | 12 ------------ etc/defaults/CC/tools.TARGETS | 12 ++++++++++++ 4 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 etc/defaults/CC/foreign/static-build.TARGETS create mode 100644 etc/defaults/CC/foreign/tools.TARGETS delete mode 100644 etc/defaults/CC/static-build.TARGETS create mode 100644 etc/defaults/CC/tools.TARGETS diff --git a/etc/defaults/CC/foreign/static-build.TARGETS b/etc/defaults/CC/foreign/static-build.TARGETS deleted file mode 100644 index 32ae01b..0000000 --- a/etc/defaults/CC/foreign/static-build.TARGETS +++ /dev/null @@ -1,15 +0,0 @@ -{ "defaults": - { "type": ["CC/foreign", "defaults"] - , "MAKE": ["make/bin/make"] - , "toolchain": ["staged-make", "staged-busybox"] - , "PATH": - [ "$(TOOLCHAIN)/make/bin" - , "$(TOOLCHAIN)/busybox/bin" - , "$(TOOLCHAIN)/busybox/usr/bin" - ] - } -, "staged-make": - {"type": "install", "dirs": [[["@", "make", "", "toolchain"], "make"]]} -, "staged-busybox": - {"type": "install", "dirs": [[["@", "busybox", "", "toolchain"], "busybox"]]} -} diff --git a/etc/defaults/CC/foreign/tools.TARGETS b/etc/defaults/CC/foreign/tools.TARGETS new file mode 100644 index 0000000..32ae01b --- /dev/null +++ b/etc/defaults/CC/foreign/tools.TARGETS @@ -0,0 +1,15 @@ +{ "defaults": + { "type": ["CC/foreign", "defaults"] + , "MAKE": ["make/bin/make"] + , "toolchain": ["staged-make", "staged-busybox"] + , "PATH": + [ "$(TOOLCHAIN)/make/bin" + , "$(TOOLCHAIN)/busybox/bin" + , "$(TOOLCHAIN)/busybox/usr/bin" + ] + } +, "staged-make": + {"type": "install", "dirs": [[["@", "make", "", "toolchain"], "make"]]} +, "staged-busybox": + {"type": "install", "dirs": [[["@", "busybox", "", "toolchain"], "busybox"]]} +} diff --git a/etc/defaults/CC/static-build.TARGETS b/etc/defaults/CC/static-build.TARGETS deleted file mode 100644 index 4b74449..0000000 --- a/etc/defaults/CC/static-build.TARGETS +++ /dev/null @@ -1,12 +0,0 @@ -{ "defaults": - { "type": ["CC", "defaults"] - , "CC": ["gcc/bin/gcc"] - , "CXX": ["gcc/bin/g++"] - , "AR": ["gcc/bin/ar"] - , "LDFLAGS": ["-static"] - , "toolchain": ["staged-gcc"] - , "PATH": ["$(TOOLCHAIN)/gcc/bin", "/bin", "/usr/bin"] - } -, "staged-gcc": - {"type": "install", "dirs": [[["@", "gcc-musl", "", "toolchain"], "gcc"]]} -} diff --git a/etc/defaults/CC/tools.TARGETS b/etc/defaults/CC/tools.TARGETS new file mode 100644 index 0000000..4b74449 --- /dev/null +++ b/etc/defaults/CC/tools.TARGETS @@ -0,0 +1,12 @@ +{ "defaults": + { "type": ["CC", "defaults"] + , "CC": ["gcc/bin/gcc"] + , "CXX": ["gcc/bin/g++"] + , "AR": ["gcc/bin/ar"] + , "LDFLAGS": ["-static"] + , "toolchain": ["staged-gcc"] + , "PATH": ["$(TOOLCHAIN)/gcc/bin", "/bin", "/usr/bin"] + } +, "staged-gcc": + {"type": "install", "dirs": [[["@", "gcc-musl", "", "toolchain"], "gcc"]]} +} -- cgit v1.2.3