authorgravatar for emekankurumeh@outlook.comemekoi <emekankurumeh@outlook.com> 2019-04-20 21:47:00-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-04-21 14:13:48-04:00
log0f8fc3b924ac0d971a800bc6e3b6c931612e06a6
tree7804b51d2bf8ca28cf9bd594f20638ca69ced50b
parent211f0a2226db7c53cfa1581c5572a6100c3e17f6

fixed stack protector issues

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

CMakeLists.txt+4-4
...@@ -50,10 +50,6 @@ option(ZIG_FORCE_EXTERNAL_LLD "If your system has the LLD patches use it instead...@@ -50,10 +50,6 @@ option(ZIG_FORCE_EXTERNAL_LLD "If your system has the LLD patches use it instead
50find_package(llvm)50find_package(llvm)
51find_package(clang)51find_package(clang)
5252
53if(MINGW)
54 find_package(z3)
55endif()
56
57if(APPLE AND ZIG_STATIC)53if(APPLE AND ZIG_STATIC)
58 list(REMOVE_ITEM LLVM_LIBRARIES "-lz")54 list(REMOVE_ITEM LLVM_LIBRARIES "-lz")
59 find_library(ZLIB NAMES z zlib libz)55 find_library(ZLIB NAMES z zlib libz)
...@@ -6668,6 +6664,7 @@ if(NOT MSVC)...@@ -6668,6 +6664,7 @@ if(NOT MSVC)
6668endif()6664endif()
66696665
6670if(MINGW)6666if(MINGW)
6667 find_library(Z3_LIBRARIES NAMES z3 z3.dll)
6671 target_link_libraries(compiler LINK_PUBLIC ${Z3_LIBRARIES})6668 target_link_libraries(compiler LINK_PUBLIC ${Z3_LIBRARIES})
6672endif()6669endif()
66736670
...@@ -6707,6 +6704,9 @@ add_custom_command(...@@ -6707,6 +6704,9 @@ add_custom_command(
6707)6704)
6708add_custom_target(userland_target DEPENDS "${LIBUSERLAND}")6705add_custom_target(userland_target DEPENDS "${LIBUSERLAND}")
6709add_executable(zig "${ZIG_MAIN_SRC}")6706add_executable(zig "${ZIG_MAIN_SRC}")
6707if(MINGW)
6708 set(EXE_LDFLAGS "${EXE_LDFLAGS} -fstack-protector")
6709endif()
6710set_target_properties(zig PROPERTIES6710set_target_properties(zig PROPERTIES
6711 COMPILE_FLAGS ${EXE_CFLAGS}6711 COMPILE_FLAGS ${EXE_CFLAGS}
6712 LINK_FLAGS ${EXE_LDFLAGS}6712 LINK_FLAGS ${EXE_LDFLAGS}