From: Rhys Kidd Date: Sat, 2 Feb 2019 23:22:16 +0000 (-0500) Subject: macOS: Don't duplicate -fno-stack-protector X-Git-Tag: VALGRIND_3_15_0~60 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cd099ab5f2571f06102f0f007df91a17106e06d;p=thirdparty%2Fvalgrind.git macOS: Don't duplicate -fno-stack-protector Since f38d96d -fno-stack-protector has been added to $(AM_CFLAGS_BASE) on all platforms, if the compiler supports it. Accordingly, there's no need to still add this a second time specifically for macOS. Fixes: f38d96d ("Add -Wformat -Wformat-security to the list of compile flags.") Signed-off-by: Rhys Kidd --- diff --git a/Makefile.all.am b/Makefile.all.am index 2ad54034f0..daa7e413f8 100644 --- a/Makefile.all.am +++ b/Makefile.all.am @@ -222,14 +222,14 @@ AM_CCASFLAGS_ARM64_LINUX = @FLAG_M64@ -g AM_FLAG_M3264_X86_DARWIN = -arch i386 AM_CFLAGS_X86_DARWIN = $(WERROR) -arch i386 $(AM_CFLAGS_BASE) \ -mmacosx-version-min=10.6 \ - -fno-stack-protector -fno-pic -fno-PIC + -fno-pic -fno-PIC AM_CFLAGS_PSO_X86_DARWIN = $(AM_CFLAGS_X86_DARWIN) $(AM_CFLAGS_PSO_BASE) AM_CCASFLAGS_X86_DARWIN = -arch i386 -g AM_FLAG_M3264_AMD64_DARWIN = -arch x86_64 AM_CFLAGS_AMD64_DARWIN = $(WERROR) -arch x86_64 $(AM_CFLAGS_BASE) \ - -mmacosx-version-min=10.6 -fno-stack-protector + -mmacosx-version-min=10.6 AM_CFLAGS_PSO_AMD64_DARWIN = $(AM_CFLAGS_AMD64_DARWIN) $(AM_CFLAGS_PSO_BASE) AM_CCASFLAGS_AMD64_DARWIN = -arch x86_64 -g