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
88408840)
88418841target_link_libraries(zig0 compiler)
88428842
8843if(WIN32)
8843if(MSVC)
88448844 set(LIBUSERLAND "${CMAKE_BINARY_DIR}/userland.lib")
88458845else()
88468846 set(LIBUSERLAND "${CMAKE_BINARY_DIR}/libuserland.a")
......@@ -8865,9 +8865,7 @@ add_custom_command(
88658865)
88668866add_custom_target(userland_target DEPENDS "${LIBUSERLAND}")
88678867add_executable(zig "${ZIG_MAIN_SRC}")
8868if(MINGW)
8869 set(EXE_LDFLAGS "${EXE_LDFLAGS} -fstack-protector")
8870endif()
8868
88718869set_target_properties(zig PROPERTIES
88728870 COMPILE_FLAGS ${EXE_CFLAGS}
88738871 LINK_FLAGS ${EXE_LDFLAGS}