authorgravatar for emekankurumeh@outlook.comemekoi <emekankurumeh@outlook.com> 2019-07-12 18:28:28-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-07-12 19:40:51-04:00
logbdfb31420a1046178406f40e867811de8d65d94a
tree76fca29630ca5a4e47ed518759c3a2f6afab403f
parent107e57484f603773d0f6b404873bdae92626749b

fixed compilation on mingw-w64

1 files changed, 2 insertions(+), 4 deletions(-)

CMakeLists.txt+2-4
...@@ -8840,7 +8840,7 @@ set_target_properties(zig0 PROPERTIES...@@ -8840,7 +8840,7 @@ set_target_properties(zig0 PROPERTIES
8840)8840)
8841target_link_libraries(zig0 compiler)8841target_link_libraries(zig0 compiler)
88428842
8843if(WIN32)8843if(MSVC)
8844 set(LIBUSERLAND "${CMAKE_BINARY_DIR}/userland.lib")8844 set(LIBUSERLAND "${CMAKE_BINARY_DIR}/userland.lib")
8845else()8845else()
8846 set(LIBUSERLAND "${CMAKE_BINARY_DIR}/libuserland.a")8846 set(LIBUSERLAND "${CMAKE_BINARY_DIR}/libuserland.a")
...@@ -8865,9 +8865,7 @@ add_custom_command(...@@ -8865,9 +8865,7 @@ add_custom_command(
8865)8865)
8866add_custom_target(userland_target DEPENDS "${LIBUSERLAND}")8866add_custom_target(userland_target DEPENDS "${LIBUSERLAND}")
8867add_executable(zig "${ZIG_MAIN_SRC}")8867add_executable(zig "${ZIG_MAIN_SRC}")
8868if(MINGW)8868
8869 set(EXE_LDFLAGS "${EXE_LDFLAGS} -fstack-protector")
8870endif()
8871set_target_properties(zig PROPERTIES8869set_target_properties(zig PROPERTIES
8872 COMPILE_FLAGS ${EXE_CFLAGS}8870 COMPILE_FLAGS ${EXE_CFLAGS}
8873 LINK_FLAGS ${EXE_LDFLAGS}8871 LINK_FLAGS ${EXE_LDFLAGS}