authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-12-04 16:45:15-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-12-06 12:15:04-07:00
log1e638cb206ffe0cd910e6e4803557e70366fef4a
tree1699a1e90fe4a1af198fd4181ad1e1117d36a93c
parente000db278295e6ca61e1d078ae32f83a9abca6da

CMake adjustments

1 files changed, 5 insertions(+), 7 deletions(-)

CMakeLists.txt+5-7
...@@ -715,8 +715,8 @@ if(MSVC)...@@ -715,8 +715,8 @@ if(MSVC)
715 set(ZIG2_LINK_FLAGS "/STACK:16777216")715 set(ZIG2_LINK_FLAGS "/STACK:16777216")
716else()716else()
717 set(ZIG_WASM2C_COMPILE_FLAGS "-std=c99 -O2")717 set(ZIG_WASM2C_COMPILE_FLAGS "-std=c99 -O2")
718 set(ZIG1_COMPILE_FLAGS "-std=c99")718 set(ZIG1_COMPILE_FLAGS "-std=c99 -Os")
719 set(ZIG2_COMPILE_FLAGS "-std=c99")719 set(ZIG2_COMPILE_FLAGS "-std=c99 -O0")
720 set(ZIG2_LINK_FLAGS "-Wl,-z,stack-size=0x10000000")720 set(ZIG2_LINK_FLAGS "-Wl,-z,stack-size=0x10000000")
721endif()721endif()
722722
...@@ -740,9 +740,7 @@ add_custom_command(...@@ -740,9 +740,7 @@ add_custom_command(
740)740)
741741
742add_executable(zig1 ${ZIG1_C_SOURCE} "${CMAKE_SOURCE_DIR}/stage1/wasi.c")742add_executable(zig1 ${ZIG1_C_SOURCE} "${CMAKE_SOURCE_DIR}/stage1/wasi.c")
743set_target_properties(zig1 PROPERTIES743set_target_properties(zig1 PROPERTIES COMPILE_FLAGS ${ZIG1_COMPILE_FLAGS})
744 COMPILE_FLAGS ${ZIG1_COMPILE_FLAGS}
745 LINK_FLAGS ${ZIG2_LINK_FLAGS})
746target_link_libraries(zig1 LINK_PUBLIC m)744target_link_libraries(zig1 LINK_PUBLIC m)
747target_include_directories(zig1 PUBLIC "${CMAKE_SOURCE_DIR}/stage1/zstd/lib")745target_include_directories(zig1 PUBLIC "${CMAKE_SOURCE_DIR}/stage1/zstd/lib")
748target_compile_definitions(zig1 PRIVATE ZSTD_DISABLE_ASM)746target_compile_definitions(zig1 PRIVATE ZSTD_DISABLE_ASM)
...@@ -762,7 +760,7 @@ add_custom_command(...@@ -762,7 +760,7 @@ add_custom_command(
762 OUTPUT "${ZIG2_C_SOURCE}"760 OUTPUT "${ZIG2_C_SOURCE}"
763 COMMAND zig1 ${BUILD_ZIG2_ARGS}761 COMMAND zig1 ${BUILD_ZIG2_ARGS}
764 DEPENDS zig1 "${ZIG_STAGE2_SOURCES}" "${ZIG1_WASM_ZST_SOURCE}"762 DEPENDS zig1 "${ZIG_STAGE2_SOURCES}" "${ZIG1_WASM_ZST_SOURCE}"
765 COMMENT STATUS "Interpreting zig1.wasm to produce ${ZIG2_C_SOURCE}"763 COMMENT STATUS "Running zig1.wasm to produce ${ZIG2_C_SOURCE}"
766 WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"764 WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
767)765)
768766
...@@ -780,7 +778,7 @@ add_custom_command(...@@ -780,7 +778,7 @@ add_custom_command(
780 OUTPUT "${ZIG_COMPILER_RT_C_SOURCE}"778 OUTPUT "${ZIG_COMPILER_RT_C_SOURCE}"
781 COMMAND zig1 ${BUILD_COMPILER_RT_ARGS}779 COMMAND zig1 ${BUILD_COMPILER_RT_ARGS}
782 DEPENDS zig1 "${ZIG_STAGE2_SOURCES}" "${ZIG1_WASM_ZST_SOURCE}"780 DEPENDS zig1 "${ZIG_STAGE2_SOURCES}" "${ZIG1_WASM_ZST_SOURCE}"
783 COMMENT STATUS "Interpreting zig1.wasm to produce ${ZIG_COMPILER_RT_C_SOURCE}"781 COMMENT STATUS "Running zig1.wasm to produce ${ZIG_COMPILER_RT_C_SOURCE}"
784 WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"782 WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
785)783)
786784