mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 14:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

update bootstrap scripts to new zig CLI

Browse Source 
Now they use the new --mod --dep parameters.
This commit is contained in:
Andrew Kelley 2023-12-24 19:18:52 -07:00
parent 24eec48f60
commit 8cf2cfc52c
2 changed files with 49 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
CMakeLists.txt
View File

@ -810,18 +810,26 @@ endif()
set(BUILD_ZIG2_ARGS set(BUILD_ZIG2_ARGS
"${CMAKE_SOURCE_DIR}/lib" "${CMAKE_SOURCE_DIR}/lib"
build-exe src/main.zig -ofmt=c -lc build-exe -ofmt=c -lc -OReleaseSmall
-OReleaseSmall --name zig2
--name zig2 -femit-bin="${ZIG2_C_SOURCE}" -femit-bin="${ZIG2_C_SOURCE}"
--mod "build_options::${ZIG_CONFIG_ZIG_OUT}"
--mod "aro_options::src/stubs/aro_options.zig"
--mod "Builtins/Builtin.def::src/stubs/aro_builtins.zig"
--mod "Attribute/names.def::src/stubs/aro_names.zig"
--mod "Diagnostics/messages.def::src/stubs/aro_messages.zig"
--mod "aro_backend:build_options=aro_options:deps/aro/backend.zig"
--mod "aro:Builtins/Builtin.def,Attribute/names.def,Diagnostics/messages.def,build_options=aro_options,backend=aro_backend:deps/aro/aro.zig"
--deps build_options,aro
-target "${ZIG_HOST_TARGET_TRIPLE}" -target "${ZIG_HOST_TARGET_TRIPLE}"
--dep "build_options"
--dep "aro"
--mod "root" "src/main.zig"
--mod "build_options" "${ZIG_CONFIG_ZIG_OUT}"
--mod "aro_options" "src/stubs/aro_options.zig"
--mod "Builtins/Builtin.def" "src/stubs/aro_builtins.zig"
--mod "Attribute/names.def" "src/stubs/aro_names.zig"
--mod "Diagnostics/messages.def" "src/stubs/aro_messages.zig"
--dep "build_options=aro_options"
--mod "aro_backend" "deps/aro/backend.zig"
--dep "Builtins/Builtin.def"
--dep "Attribute/names.def"
--dep "Diagnostics/messages.def"
--dep "build_options=aro_options"
--dep "backend=aro_backend"
--mod "aro" "deps/aro/aro.zig"
) )
add_custom_command( add_custom_command(
@ -834,12 +842,13 @@ add_custom_command(
set(BUILD_COMPILER_RT_ARGS set(BUILD_COMPILER_RT_ARGS
"${CMAKE_SOURCE_DIR}/lib" "${CMAKE_SOURCE_DIR}/lib"
build-obj lib/compiler_rt.zig -ofmt=c build-obj -ofmt=c -OReleaseSmall
-OReleaseSmall --name compiler_rt
--name compiler_rt -femit-bin="${ZIG_COMPILER_RT_C_SOURCE}" -femit-bin="${ZIG_COMPILER_RT_C_SOURCE}"
--mod "build_options::${ZIG_CONFIG_ZIG_OUT}"
--deps build_options
-target "${ZIG_HOST_TARGET_TRIPLE}" -target "${ZIG_HOST_TARGET_TRIPLE}"
--dep "build_options"
--mod "root" "lib/compiler_rt.zig"
--mod "build_options" "${ZIG_CONFIG_ZIG_OUT}"
) )
add_custom_command( add_custom_command(

36
bootstrap.c
View File

@ -138,18 +138,29 @@ int main(int argc, char **argv) {
{ {
const char *child_argv[] = { const char *child_argv[] = {
"./zig1", "lib", "build-exe", "src/main.zig", "./zig1", "lib", "build-exe",
"-ofmt=c", "-lc", "-OReleaseSmall", "-ofmt=c", "-lc", "-OReleaseSmall",
"--name", "zig2", "-femit-bin=zig2.c", "--name", "zig2", "-femit-bin=zig2.c",
"--mod", "build_options::config.zig",
"--mod", "aro_options::src/stubs/aro_options.zig",
"--mod", "Builtins/Builtin.def::src/stubs/aro_builtins.zig",
"--mod", "Attribute/names.def::src/stubs/aro_names.zig",
"--mod", "Diagnostics/messages.def::src/stubs/aro_messages.zig",
"--mod", "aro_backend:build_options=aro_options:deps/aro/backend.zig",
"--mod", "aro:Builtins/Builtin.def,Attribute/names.def,Diagnostics/messages.def,build_options=aro_options,backend=aro_backend:deps/aro/aro.zig",
"--deps", "build_options,aro",
"-target", host_triple, "-target", host_triple,
"--dep", "build_options",
"--dep", "aro",
"--mod", "root", "src/main.zig",
"--mod", "build_options", "config.zig",
"--mod", "aro_options", "src/stubs/aro_options.zig",
"--mod", "Builtins/Builtin.def", "src/stubs/aro_builtins.zig",
"--mod", "Attribute/names.def", "src/stubs/aro_names.zig",
"--mod", "Diagnostics/messages.def", "src/stubs/aro_messages.zig",
"--dep", "build_options=aro_options",
"--mod", "aro_backend", "deps/aro/backend.zig",
"--dep", "Builtins/Builtin.def",
"--dep", "Attribute/names.def",
"--dep", "Diagnostics/messages.def",
"--dep", "build_options=aro_options",
"--dep", "backend=aro_backend",
"--mod", "aro", "deps/aro/aro.zig",
NULL, NULL,
}; };
print_and_run(child_argv); print_and_run(child_argv);
@ -157,12 +168,13 @@ int main(int argc, char **argv) {
{ {
const char *child_argv[] = { const char *child_argv[] = {
"./zig1", "lib", "build-obj", "lib/compiler_rt.zig", "./zig1", "lib", "build-obj",
"-ofmt=c", "-OReleaseSmall", "-ofmt=c", "-OReleaseSmall",
"--name", "compiler_rt", "-femit-bin=compiler_rt.c", "--name", "compiler_rt", "-femit-bin=compiler_rt.c",
"--mod", "build_options::config.zig",
"--deps", "build_options",
"-target", host_triple, "-target", host_triple,
"--dep", "build_options",
"--mod", "root", "lib/compiler_rt.zig",
"--mod", "build_options", "config.zig",
NULL, NULL,
}; };
print_and_run(child_argv); print_and_run(child_argv);