From 0f8fc3b924ac0d971a800bc6e3b6c931612e06a6 Mon Sep 17 00:00:00 2001 From: emekoi Date: Sat, 20 Apr 2019 21:47:00 -0500 Subject: [PATCH] fixed stack protector issues --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a482ddf50f..1f6ee5a852 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,10 +50,6 @@ option(ZIG_FORCE_EXTERNAL_LLD "If your system has the LLD patches use it instead find_package(llvm) find_package(clang) -if(MINGW) - find_package(z3) -endif() - if(APPLE AND ZIG_STATIC) list(REMOVE_ITEM LLVM_LIBRARIES "-lz") find_library(ZLIB NAMES z zlib libz) @@ -6668,6 +6664,7 @@ if(NOT MSVC) endif() if(MINGW) + find_library(Z3_LIBRARIES NAMES z3 z3.dll) target_link_libraries(compiler LINK_PUBLIC ${Z3_LIBRARIES}) endif() @@ -6707,6 +6704,9 @@ 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}