| author |  Andrew Kelley <andrew@ziglang.org> 2023-12-24 19:18:52-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2024-01-01 17:51:21-07:00 |
| log | 8cf2cfc52c23fec8de2fa8ca54c2589daed2135b |
| tree | 56f138b5c71beeb8819d953fbf3fefd58d488e3b |
| parent | 24eec48f60c2002e491d78a5c199a4c39d50e48a |
update bootstrap scripts to new zig CLI
Now they use the new --mod --dep parameters.2 files changed, 49 insertions(+), 28 deletions(-)
CMakeLists.txt+25-16
| ... | ... | @@ -810,18 +810,26 @@ endif() |
| 810 | 810 | |
| 811 | 811 | set(BUILD_ZIG2_ARGS |
| 812 | 812 | "${CMAKE_SOURCE_DIR}/lib" |
| 813 | build-exe src/main.zig -ofmt=c -lc | |
| 814 | -OReleaseSmall | |
| 815 | --name zig2 -femit-bin="${ZIG2_C_SOURCE}" | |
| 816 | --mod "build_options::${ZIG_CONFIG_ZIG_OUT}" | |
| 817 | --mod "aro_options::src/stubs/aro_options.zig" | |
| 818 | --mod "Builtins/Builtin.def::src/stubs/aro_builtins.zig" | |
| 819 | --mod "Attribute/names.def::src/stubs/aro_names.zig" | |
| 820 | --mod "Diagnostics/messages.def::src/stubs/aro_messages.zig" | |
| 821 | --mod "aro_backend:build_options=aro_options:deps/aro/backend.zig" | |
| 822 | --mod "aro:Builtins/Builtin.def,Attribute/names.def,Diagnostics/messages.def,build_options=aro_options,backend=aro_backend:deps/aro/aro.zig" | |
| 823 | --deps build_options,aro | |
| 813 | build-exe -ofmt=c -lc -OReleaseSmall | |
| 814 | --name zig2 | |
| 815 | -femit-bin="${ZIG2_C_SOURCE}" | |
| 824 | 816 | -target "${ZIG_HOST_TARGET_TRIPLE}" |
| 817 | --dep "build_options" | |
| 818 | --dep "aro" | |
| 819 | --mod "root" "src/main.zig" | |
| 820 | --mod "build_options" "${ZIG_CONFIG_ZIG_OUT}" | |
| 821 | --mod "aro_options" "src/stubs/aro_options.zig" | |
| 822 | --mod "Builtins/Builtin.def" "src/stubs/aro_builtins.zig" | |
| 823 | --mod "Attribute/names.def" "src/stubs/aro_names.zig" | |
| 824 | --mod "Diagnostics/messages.def" "src/stubs/aro_messages.zig" | |
| 825 | --dep "build_options=aro_options" | |
| 826 | --mod "aro_backend" "deps/aro/backend.zig" | |
| 827 | --dep "Builtins/Builtin.def" | |
| 828 | --dep "Attribute/names.def" | |
| 829 | --dep "Diagnostics/messages.def" | |
| 830 | --dep "build_options=aro_options" | |
| 831 | --dep "backend=aro_backend" | |
| 832 | --mod "aro" "deps/aro/aro.zig" | |
| 825 | 833 | ) |
| 826 | 834 | |
| 827 | 835 | add_custom_command( |
| ... | ... | @@ -834,12 +842,13 @@ add_custom_command( |
| 834 | 842 | |
| 835 | 843 | set(BUILD_COMPILER_RT_ARGS |
| 836 | 844 | "${CMAKE_SOURCE_DIR}/lib" |
| 837 | build-obj lib/compiler_rt.zig -ofmt=c | |
| 838 | -OReleaseSmall | |
| 839 | --name compiler_rt -femit-bin="${ZIG_COMPILER_RT_C_SOURCE}" | |
| 840 | --mod "build_options::${ZIG_CONFIG_ZIG_OUT}" | |
| 841 | --deps build_options | |
| 845 | build-obj -ofmt=c -OReleaseSmall | |
| 846 | --name compiler_rt | |
| 847 | -femit-bin="${ZIG_COMPILER_RT_C_SOURCE}" | |
| 842 | 848 | -target "${ZIG_HOST_TARGET_TRIPLE}" |
| 849 | --dep "build_options" | |
| 850 | --mod "root" "lib/compiler_rt.zig" | |
| 851 | --mod "build_options" "${ZIG_CONFIG_ZIG_OUT}" | |
| 843 | 852 | ) |
| 844 | 853 | |
| 845 | 854 | add_custom_command( |
bootstrap.c+24-12
| ... | ... | @@ -138,18 +138,29 @@ int main(int argc, char **argv) { |
| 138 | 138 | |
| 139 | 139 | { |
| 140 | 140 | const char *child_argv[] = { |
| 141 | "./zig1", "lib", "build-exe", "src/main.zig", | |
| 141 | "./zig1", "lib", "build-exe", | |
| 142 | 142 | "-ofmt=c", "-lc", "-OReleaseSmall", |
| 143 | 143 | "--name", "zig2", "-femit-bin=zig2.c", |
| 144 | "--mod", "build_options::config.zig", | |
| 145 | "--mod", "aro_options::src/stubs/aro_options.zig", | |
| 146 | "--mod", "Builtins/Builtin.def::src/stubs/aro_builtins.zig", | |
| 147 | "--mod", "Attribute/names.def::src/stubs/aro_names.zig", | |
| 148 | "--mod", "Diagnostics/messages.def::src/stubs/aro_messages.zig", | |
| 149 | "--mod", "aro_backend:build_options=aro_options:deps/aro/backend.zig", | |
| 150 | "--mod", "aro:Builtins/Builtin.def,Attribute/names.def,Diagnostics/messages.def,build_options=aro_options,backend=aro_backend:deps/aro/aro.zig", | |
| 151 | "--deps", "build_options,aro", | |
| 152 | 144 | "-target", host_triple, |
| 145 | "--dep", "build_options", | |
| 146 | "--dep", "aro", | |
| 147 | "--mod", "root", "src/main.zig", | |
| 148 | ||
| 149 | "--mod", "build_options", "config.zig", | |
| 150 | "--mod", "aro_options", "src/stubs/aro_options.zig", | |
| 151 | "--mod", "Builtins/Builtin.def", "src/stubs/aro_builtins.zig", | |
| 152 | "--mod", "Attribute/names.def", "src/stubs/aro_names.zig", | |
| 153 | "--mod", "Diagnostics/messages.def", "src/stubs/aro_messages.zig", | |
| 154 | ||
| 155 | "--dep", "build_options=aro_options", | |
| 156 | "--mod", "aro_backend", "deps/aro/backend.zig", | |
| 157 | ||
| 158 | "--dep", "Builtins/Builtin.def", | |
| 159 | "--dep", "Attribute/names.def", | |
| 160 | "--dep", "Diagnostics/messages.def", | |
| 161 | "--dep", "build_options=aro_options", | |
| 162 | "--dep", "backend=aro_backend", | |
| 163 | "--mod", "aro", "deps/aro/aro.zig", | |
| 153 | 164 | NULL, |
| 154 | 165 | }; |
| 155 | 166 | print_and_run(child_argv); |
| ... | ... | @@ -157,12 +168,13 @@ int main(int argc, char **argv) { |
| 157 | 168 | |
| 158 | 169 | { |
| 159 | 170 | const char *child_argv[] = { |
| 160 | "./zig1", "lib", "build-obj", "lib/compiler_rt.zig", | |
| 171 | "./zig1", "lib", "build-obj", | |
| 161 | 172 | "-ofmt=c", "-OReleaseSmall", |
| 162 | 173 | "--name", "compiler_rt", "-femit-bin=compiler_rt.c", |
| 163 | "--mod", "build_options::config.zig", | |
| 164 | "--deps", "build_options", | |
| 165 | 174 | "-target", host_triple, |
| 175 | "--dep", "build_options", | |
| 176 | "--mod", "root", "lib/compiler_rt.zig", | |
| 177 | "--mod", "build_options", "config.zig", | |
| 166 | 178 | NULL, |
| 167 | 179 | }; |
| 168 | 180 | print_and_run(child_argv); |