From bdfb31420a1046178406f40e867811de8d65d94a Mon Sep 17 00:00:00 2001 From: emekoi Date: Fri, 12 Jul 2019 18:28:28 -0500 Subject: [PATCH] fixed compilation on mingw-w64 --- CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ceadb768..52552cc3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8840,7 +8840,7 @@ set_target_properties(zig0 PROPERTIES ) target_link_libraries(zig0 compiler) -if(WIN32) +if(MSVC) set(LIBUSERLAND "${CMAKE_BINARY_DIR}/userland.lib") else() set(LIBUSERLAND "${CMAKE_BINARY_DIR}/libuserland.a") @@ -8865,9 +8865,7 @@ add_custom_command( ) add_custom_target(userland_target DEPENDS "${LIBUSERLAND}") add_executable(zig "${ZIG_MAIN_SRC}") -if(MINGW) - set(EXE_LDFLAGS "${EXE_LDFLAGS} -fstack-protector") -endif() + set_target_properties(zig PROPERTIES COMPILE_FLAGS ${EXE_CFLAGS} LINK_FLAGS ${EXE_LDFLAGS}