diff options
-rw-r--r-- | etc/defaults/CC/foreign/clang.TARGETS | 4 | ||||
-rw-r--r-- | etc/defaults/CC/foreign/gcc.TARGETS | 4 | ||||
-rw-r--r-- | etc/defaults/CC/foreign/stage-1.TARGETS | 4 | ||||
-rw-r--r-- | etc/defaults/CC/foreign/test.TARGETS | 7 | ||||
-rw-r--r-- | etc/defaults/CC/foreign/tools.TARGETS | 4 | ||||
-rw-r--r-- | etc/repos.json | 25 |
6 files changed, 43 insertions, 5 deletions
diff --git a/etc/defaults/CC/foreign/clang.TARGETS b/etc/defaults/CC/foreign/clang.TARGETS index 3c8dc50..ab59f07 100644 --- a/etc/defaults/CC/foreign/clang.TARGETS +++ b/etc/defaults/CC/foreign/clang.TARGETS @@ -6,4 +6,8 @@ , ["@", "python", "CC/foreign", "defaults"] ] } +, "expand_exec": + { "type": "configure" + , "target": ["@", "stage-0", "CC/foreign", "expand_exec"] + } } diff --git a/etc/defaults/CC/foreign/gcc.TARGETS b/etc/defaults/CC/foreign/gcc.TARGETS index b9ea991..5104c84 100644 --- a/etc/defaults/CC/foreign/gcc.TARGETS +++ b/etc/defaults/CC/foreign/gcc.TARGETS @@ -2,4 +2,8 @@ { "type": ["CC/foreign", "defaults"] , "base": [["@", "base", "CC/foreign", "defaults"]] } +, "expand_exec": + { "type": "configure" + , "target": ["@", "stage-0", "CC/foreign", "expand_exec"] + } } diff --git a/etc/defaults/CC/foreign/stage-1.TARGETS b/etc/defaults/CC/foreign/stage-1.TARGETS index 32ae01b..b1219fe 100644 --- a/etc/defaults/CC/foreign/stage-1.TARGETS +++ b/etc/defaults/CC/foreign/stage-1.TARGETS @@ -12,4 +12,8 @@ {"type": "install", "dirs": [[["@", "make", "", "toolchain"], "make"]]} , "staged-busybox": {"type": "install", "dirs": [[["@", "busybox", "", "toolchain"], "busybox"]]} +, "expand_exec": + { "type": "configure" + , "target": ["@", "stage-0", "CC/foreign", "expand_exec"] + } } diff --git a/etc/defaults/CC/foreign/test.TARGETS b/etc/defaults/CC/foreign/test.TARGETS index 8b2aad4..7096f5f 100644 --- a/etc/defaults/CC/foreign/test.TARGETS +++ b/etc/defaults/CC/foreign/test.TARGETS @@ -1 +1,6 @@ -{"defaults": {"type": ["CC/foreign", "defaults"]}} +{ "defaults": {"type": ["CC/foreign", "defaults"]} +, "expand_exec": + { "type": "configure" + , "target": ["@", "stage-0", "CC/foreign", "expand_exec"] + } +} diff --git a/etc/defaults/CC/foreign/tools.TARGETS b/etc/defaults/CC/foreign/tools.TARGETS index b9ea991..5104c84 100644 --- a/etc/defaults/CC/foreign/tools.TARGETS +++ b/etc/defaults/CC/foreign/tools.TARGETS @@ -2,4 +2,8 @@ { "type": ["CC/foreign", "defaults"] , "base": [["@", "base", "CC/foreign", "defaults"]] } +, "expand_exec": + { "type": "configure" + , "target": ["@", "stage-0", "CC/foreign", "expand_exec"] + } } diff --git a/etc/repos.json b/etc/repos.json index b1f80f4..5e941a1 100644 --- a/etc/repos.json +++ b/etc/repos.json @@ -32,6 +32,7 @@ { "make": "stage-0/make" , "busybox": "stage-0/busybox" , "gcc": "stage-0/gcc" + , "stage-0": "rules/stage-0" } } , "rules/gcc": @@ -39,7 +40,11 @@ , "target_root": "defaults" , "target_file_name": "gcc.TARGETS" , "rule_root": "rules" - , "bindings": {"base": "rules/stage-1", "gcc": "stage-1/gcc"} + , "bindings": + { "base": "rules/stage-1" + , "gcc": "stage-1/gcc" + , "stage-0": "rules/stage-0" + } } , "rules/clang_with_gcc13": { "repository": "rules" @@ -51,6 +56,7 @@ , "gcc": "compilers/gcc-13.2.0-native" , "cmake": "cmake-3.27.1" , "python": "python-3.12.0" + , "stage-0": "rules/stage-0" } } , "rules/tools": @@ -59,7 +65,10 @@ , "target_file_name": "tools.TARGETS" , "rule_root": "rules" , "bindings": - {"base": "rules/gcc", "gcc-musl": "compilers/gcc-14.1.0-musl"} + { "base": "rules/gcc" + , "gcc-musl": "compilers/gcc-14.1.0-musl" + , "stage-0": "rules/stage-0" + } } , "imports/stage-0/gmp-4.2.4": { "repository": @@ -726,14 +735,22 @@ , "target_root": "defaults" , "target_file_name": "test.TARGETS" , "rule_root": "rules" - , "bindings": {"rules": "rules", "toolchain": "gcc-latest-musl-static"} + , "bindings": + { "rules": "rules" + , "toolchain": "gcc-latest-musl-static" + , "stage-0": "rules/stage-0" + } } , "test/rules-clang-native": { "repository": "rules" , "target_root": "defaults" , "target_file_name": "test.TARGETS" , "rule_root": "rules" - , "bindings": {"rules": "rules", "toolchain": "clang-latest-native"} + , "bindings": + { "rules": "rules" + , "toolchain": "clang-latest-native" + , "stage-0": "rules/stage-0" + } } , "test/gcc-native": { "repository": {"type": "file", "path": "test"} |