| ... | @@ -725,11 +725,12 @@ target_include_directories(zig1 PUBLIC "${CMAKE_SOURCE_DIR}/stage1/zstd/lib") | ... | @@ -725,11 +725,12 @@ target_include_directories(zig1 PUBLIC "${CMAKE_SOURCE_DIR}/stage1/zstd/lib") |
| 725 | target_compile_definitions(zig1 PRIVATE ZSTD_DISABLE_ASM) | 725 | target_compile_definitions(zig1 PRIVATE ZSTD_DISABLE_ASM) |
| 726 | | 726 | |
| 727 | set(ZIG2_C_SOURCE "${CMAKE_BINARY_DIR}/zig2.c") | 727 | set(ZIG2_C_SOURCE "${CMAKE_BINARY_DIR}/zig2.c") |
| | 728 | set(ZIG1_WASM_ZST_SOURCE "${CMAKE_SOURCE_DIR}/stage1/zig1.wasm.zst") |
| 728 | set(BUILD_ZIG2_ARGS | 729 | set(BUILD_ZIG2_ARGS |
| 729 | "${CMAKE_SOURCE_DIR}/lib" | 730 | "${CMAKE_SOURCE_DIR}/lib" |
| 730 | "${CMAKE_BINARY_DIR}" | 731 | "${CMAKE_BINARY_DIR}" |
| 731 | zig2 | 732 | zig2 |
| 732 | "${CMAKE_SOURCE_DIR}/stage1/zig1.wasm.zst" | 733 | "${ZIG1_WASM_ZST_SOURCE}" |
| 733 | build-exe src/main.zig -ofmt=c -lc | 734 | build-exe src/main.zig -ofmt=c -lc |
| 734 | -OReleaseFast | 735 | -OReleaseFast |
| 735 | ) | 736 | ) |
| ... | @@ -737,7 +738,7 @@ set(BUILD_ZIG2_ARGS | ... | @@ -737,7 +738,7 @@ set(BUILD_ZIG2_ARGS |
| 737 | add_custom_command( | 738 | add_custom_command( |
| 738 | OUTPUT "${ZIG2_C_SOURCE}" | 739 | OUTPUT "${ZIG2_C_SOURCE}" |
| 739 | COMMAND zig1 ${BUILD_ZIG2_ARGS} | 740 | COMMAND zig1 ${BUILD_ZIG2_ARGS} |
| 740 | DEPENDS zig1 "${ZIG_STAGE2_SOURCES}" | 741 | DEPENDS zig1 "${ZIG_STAGE2_SOURCES}" "${ZIG1_WASM_ZST_SOURCE}" |
| 741 | COMMENT STATUS "Interpreting zig1.wasm to produce ${ZIG2_C_SOURCE}" | 742 | COMMENT STATUS "Interpreting zig1.wasm to produce ${ZIG2_C_SOURCE}" |
| 742 | WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" | 743 | WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" |
| 743 | ) | 744 | ) |
| ... | @@ -755,7 +756,7 @@ set(BUILD_COMPILER_RT_ARGS | ... | @@ -755,7 +756,7 @@ set(BUILD_COMPILER_RT_ARGS |
| 755 | add_custom_command( | 756 | add_custom_command( |
| 756 | OUTPUT "${ZIG_COMPILER_RT_C_SOURCE}" | 757 | OUTPUT "${ZIG_COMPILER_RT_C_SOURCE}" |
| 757 | COMMAND zig1 ${BUILD_COMPILER_RT_ARGS} | 758 | COMMAND zig1 ${BUILD_COMPILER_RT_ARGS} |
| 758 | DEPENDS zig1 "${ZIG_STAGE2_SOURCES}" | 759 | DEPENDS zig1 "${ZIG_STAGE2_SOURCES}" "${ZIG1_WASM_ZST_SOURCE}" |
| 759 | COMMENT STATUS "Interpreting zig1.wasm to produce ${ZIG_COMPILER_RT_C_SOURCE}" | 760 | COMMENT STATUS "Interpreting zig1.wasm to produce ${ZIG_COMPILER_RT_C_SOURCE}" |
| 760 | WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" | 761 | WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" |
| 761 | ) | 762 | ) |