authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2022-12-05 20:05:34-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-12-06 12:27:28-07:00
log98338358ede66020458e83b1ec7cda79eac2698b
tree393ca1ede7b0e0b5ba853f8ed3a2018f723d0360
parent3fb1b2caefd692aa351b5add4cbcbbf91e4e9f9f

cmake: fix bootstrap dependencies

1 files changed, 8 insertions(+), 9 deletions(-)

CMakeLists.txt+8-9
...@@ -738,7 +738,7 @@ else()...@@ -738,7 +738,7 @@ else()
738 endif()738 endif()
739endif()739endif()
740740
741set(ZIG1_WASM_SOURCE "${CMAKE_SOURCE_DIR}/stage1/zig1.wasm.zst")741set(ZIG1_WASM_ZST_SOURCE "${CMAKE_SOURCE_DIR}/stage1/zig1.wasm.zst")
742set(ZIG1_C_SOURCE "${CMAKE_BINARY_DIR}/zig1.c")742set(ZIG1_C_SOURCE "${CMAKE_BINARY_DIR}/zig1.c")
743set(ZIG2_C_SOURCE "${CMAKE_BINARY_DIR}/zig2.c")743set(ZIG2_C_SOURCE "${CMAKE_BINARY_DIR}/zig2.c")
744set(ZIG_COMPILER_RT_C_SOURCE "${CMAKE_BINARY_DIR}/compiler_rt.c")744set(ZIG_COMPILER_RT_C_SOURCE "${CMAKE_BINARY_DIR}/compiler_rt.c")
...@@ -750,9 +750,9 @@ target_compile_definitions(zig-wasm2c PRIVATE ZSTD_DISABLE_ASM)...@@ -750,9 +750,9 @@ target_compile_definitions(zig-wasm2c PRIVATE ZSTD_DISABLE_ASM)
750750
751add_custom_command(751add_custom_command(
752 OUTPUT "${ZIG1_C_SOURCE}"752 OUTPUT "${ZIG1_C_SOURCE}"
753 COMMAND zig-wasm2c "${ZIG1_WASM_SOURCE}" "${ZIG1_C_SOURCE}"753 COMMAND zig-wasm2c "${ZIG1_WASM_ZST_SOURCE}" "${ZIG1_C_SOURCE}"
754 DEPENDS zig-wasm2c "${ZIG1_WASM_SOURCE}"754 DEPENDS zig-wasm2c "${ZIG1_WASM_ZST_SOURCE}"
755 COMMENT STATUS "Converting ${ZIG1_WASM_SOURCE} to ${ZIG1_C_SOURCE}"755 COMMENT STATUS "Converting ${ZIG1_WASM_ZST_SOURCE} to ${ZIG1_C_SOURCE}"
756 WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"756 WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
757)757)
758758
...@@ -762,20 +762,19 @@ target_link_libraries(zig1 LINK_PUBLIC m)...@@ -762,20 +762,19 @@ target_link_libraries(zig1 LINK_PUBLIC m)
762target_include_directories(zig1 PUBLIC "${CMAKE_SOURCE_DIR}/stage1/zstd/lib")762target_include_directories(zig1 PUBLIC "${CMAKE_SOURCE_DIR}/stage1/zstd/lib")
763target_compile_definitions(zig1 PRIVATE ZSTD_DISABLE_ASM)763target_compile_definitions(zig1 PRIVATE ZSTD_DISABLE_ASM)
764764
765set(ZIG1_WASM_ZST_SOURCE "${CMAKE_SOURCE_DIR}/stage1/zig1.wasm.zst")
766set(BUILD_ZIG2_ARGS765set(BUILD_ZIG2_ARGS
767 "${CMAKE_SOURCE_DIR}/lib"766 "${CMAKE_SOURCE_DIR}/lib"
768 build-exe src/main.zig -ofmt=c -lc767 build-exe src/main.zig -ofmt=c -lc
769 -OReleaseSmall768 -OReleaseSmall
770 --name zig2 -femit-bin="${ZIG2_C_SOURCE}"769 --name zig2 -femit-bin="${ZIG2_C_SOURCE}"
771 --pkg-begin build_options "${CMAKE_BINARY_DIR}/config.zig" --pkg-end770 --pkg-begin build_options "${ZIG_CONFIG_ZIG_OUT}" --pkg-end
772 -target "${HOST_TARGET_TRIPLE}"771 -target "${HOST_TARGET_TRIPLE}"
773)772)
774 773
775add_custom_command(774add_custom_command(
776 OUTPUT "${ZIG2_C_SOURCE}"775 OUTPUT "${ZIG2_C_SOURCE}"
777 COMMAND zig1 ${BUILD_ZIG2_ARGS}776 COMMAND zig1 ${BUILD_ZIG2_ARGS}
778 DEPENDS zig1 "${ZIG_STAGE2_SOURCES}" "${ZIG1_WASM_ZST_SOURCE}"777 DEPENDS zig1 "${ZIG_STAGE2_SOURCES}"
779 COMMENT STATUS "Running zig1.wasm to produce ${ZIG2_C_SOURCE}"778 COMMENT STATUS "Running zig1.wasm to produce ${ZIG2_C_SOURCE}"
780 WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"779 WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
781)780)
...@@ -785,14 +784,14 @@ set(BUILD_COMPILER_RT_ARGS...@@ -785,14 +784,14 @@ set(BUILD_COMPILER_RT_ARGS
785 build-obj lib/compiler_rt.zig -ofmt=c784 build-obj lib/compiler_rt.zig -ofmt=c
786 -OReleaseSmall785 -OReleaseSmall
787 --name compiler_rt -femit-bin="${ZIG_COMPILER_RT_C_SOURCE}"786 --name compiler_rt -femit-bin="${ZIG_COMPILER_RT_C_SOURCE}"
788 --pkg-begin build_options "${CMAKE_BINARY_DIR}/config.zig" --pkg-end787 --pkg-begin build_options "${ZIG_CONFIG_ZIG_OUT}" --pkg-end
789 -target "${HOST_TARGET_TRIPLE}"788 -target "${HOST_TARGET_TRIPLE}"
790)789)
791 790
792add_custom_command(791add_custom_command(
793 OUTPUT "${ZIG_COMPILER_RT_C_SOURCE}"792 OUTPUT "${ZIG_COMPILER_RT_C_SOURCE}"
794 COMMAND zig1 ${BUILD_COMPILER_RT_ARGS}793 COMMAND zig1 ${BUILD_COMPILER_RT_ARGS}
795 DEPENDS zig1 "${ZIG_STAGE2_SOURCES}" "${ZIG1_WASM_ZST_SOURCE}"794 DEPENDS zig1 "${ZIG_STAGE2_SOURCES}"
796 COMMENT STATUS "Running zig1.wasm to produce ${ZIG_COMPILER_RT_C_SOURCE}"795 COMMENT STATUS "Running zig1.wasm to produce ${ZIG_COMPILER_RT_C_SOURCE}"
797 WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"796 WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
798)797)