summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-07-11 15:16:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-07-11 15:16:47 -0700
commit32749c35a4ca4f5b2a876f799ede7343b12cc658 (patch)
treeeeb1402eb2f5de72e20fb9bd9ce10e1fa3298ddf
parentMerge branch 'cb/windows-manifest' (diff)
parentmingw: enable stack smashing protector (diff)
downloadtgif-32749c35a4ca4f5b2a876f799ede7343b12cc658.tar.xz
Merge branch 'js/mingw-gcc-stack-protect'
Windows update. * js/mingw-gcc-stack-protect: mingw: enable stack smashing protector
-rw-r--r--config.mak.uname3
1 files changed, 2 insertions, 1 deletions
diff --git a/config.mak.uname b/config.mak.uname
index 3fde48c64d..48a6723222 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -655,7 +655,8 @@ else
BASIC_LDFLAGS += -Wl,--large-address-aware
endif
CC = gcc
- COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY
+ COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY \
+ -fstack-protector-strong
EXTLIBS += -lntdll
INSTALL = /bin/install
NO_R_TO_GCC_LINKER = YesPlease