aboutsummaryrefslogtreecommitdiffstats
path: root/src/build-data
diff options
context:
space:
mode:
authorlloyd <[email protected]>2014-12-21 15:53:01 +0000
committerlloyd <[email protected]>2014-12-21 15:53:01 +0000
commitafe3d5fe0a528f7addae6bba999b739789b8b3a8 (patch)
tree080decc3a3789612f74a1fa9a37c55fbf61f8b3f /src/build-data
parent5a8a44b003bcc7b090537e354a38bab498eee96c (diff)
Stack protector flags are required also at link time, at least on MinGW
Github issue 34
Diffstat (limited to 'src/build-data')
-rw-r--r--src/build-data/cc/gcc.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 3872dfdbf..a547f4c99 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -8,7 +8,7 @@ add_include_dir_option -I
add_lib_dir_option -L
add_lib_option -l
-lang_flags "-std=c++11 -D_REENTRANT -fstack-protector"
+lang_flags "-std=c++11 -D_REENTRANT"
maintainer_warning_flags "-Werror -Wno-error=old-style-cast -Wno-error=zero-as-null-pointer-constant -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=strict-overflow"
warning_flags "-Wall -Wextra -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wold-style-cast -Wzero-as-null-pointer-constant"
@@ -96,9 +96,9 @@ all_x86_32 -> "-momit-leaf-frame-pointer"
all_x86_64 -> "-momit-leaf-frame-pointer"
</mach_opt>
-# The 'linking' bit means "use this for both compiling *and* linking"
+# Flags set here are included at compile and link time
<mach_abi_linking>
-all -> "-pthread"
+all -> "-pthread -fstack-protector"
mips64 -> "-mabi=64"
s390 -> "-m31"