authorgravatar for 396151+h57624paen@users.noreply.github.comh57624paen <396151+h57624paen@users.noreply.github.com> 2022-12-09 09:32:20-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-12-09 22:35:05-05:00
logb483c796c66e3a415a7590bfe62f316fa8fa70e6
tree44422ee89253e990bc79e597d411aef9e58b8eed
parente945045437f6d3b60e308bf5116291cb78bdef49

fix building wasm2c output with msvc

cmake tweaks to allow zig1 to compile successfully with msvc

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

CMakeLists.txt+8-3
......@@ -723,7 +723,7 @@ endif()
723723set(HOST_TARGET_TRIPLE "${HOST_TARGET_ARCH}-${HOST_TARGET_OS}")
724724
725725if(MSVC)
726 set(ZIG_WASM2C_COMPILE_FLAGS "/std:c99 /O2")
726 set(ZIG_WASM2C_COMPILE_FLAGS "")
727727 set(ZIG1_COMPILE_FLAGS "/std:c99 /Os")
728728 set(ZIG2_COMPILE_FLAGS "/std:c99 /O0")
729729 set(ZIG2_LINK_FLAGS "/STACK:16777216")
......@@ -744,7 +744,7 @@ set(ZIG2_C_SOURCE "${CMAKE_BINARY_DIR}/zig2.c")
744744set(ZIG_COMPILER_RT_C_SOURCE "${CMAKE_BINARY_DIR}/compiler_rt.c")
745745
746746add_executable(zig-wasm2c ${ZIG_WASM2C_SOURCES})
747set_target_properties(zig-wasm2c PROPERTIES COMPILE_FLAGS ${ZIG_WASM2C_COMPILE_FLAGS})
747set_target_properties(zig-wasm2c PROPERTIES COMPILE_FLAGS "${ZIG_WASM2C_COMPILE_FLAGS}")
748748target_include_directories(zig-wasm2c PUBLIC "${CMAKE_SOURCE_DIR}/stage1/zstd/lib")
749749target_compile_definitions(zig-wasm2c PRIVATE ZSTD_DISABLE_ASM)
750750
......@@ -758,7 +758,12 @@ add_custom_command(
758758
759759add_executable(zig1 ${ZIG1_C_SOURCE} "${CMAKE_SOURCE_DIR}/stage1/wasi.c")
760760set_target_properties(zig1 PROPERTIES COMPILE_FLAGS ${ZIG1_COMPILE_FLAGS})
761target_link_libraries(zig1 LINK_PUBLIC m)
761
762if(MSVC)
763 target_link_options(zig1 PRIVATE /STACK:0x10000000)
764else()
765 target_link_libraries(zig1 LINK_PUBLIC m)
766endif()
762767target_include_directories(zig1 PUBLIC "${CMAKE_SOURCE_DIR}/stage1/zstd/lib")
763768target_compile_definitions(zig1 PRIVATE ZSTD_DISABLE_ASM)
764769