Apply patch by gdb@crelg.com

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@40061 72102866-910b-0410-8b05-ffd578937521
Deek · Aug 19, 2016 · 9adc489 · 9adc489
1 parent c02ec7f
commit 9adc489
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2016-08-19 Giah de Barag <gdb@crelg.com>
+
+	* common.make: filter out optimisation flags when in debug mode.
+
 2016-07-10 13:33-EDT Gregory John Casamento <greg.casamento@gmail.com>
 
 	* GNUmakefile.in: add pkgconfig.make to INSTANCE_SHARED_MAKE_FILES

diff --git a/common.make b/common.make
@@ -753,6 +753,8 @@ endif
 ifeq ($(debug), yes)
   # Optimization flags are filtered out as they make debugging harder.
   OPTFLAG := $(filter-out -O%, $(OPTFLAG))
+  CCFLAGS := $(filter-out -O%, $(CCFLAGS))
+  ADDITIONAL_FLAGS := $(filter-out -O%, $(ADDITIONAL_FLAGS))
   # If OPTFLAG does not already include -g, add it here.
   ifneq ($(filter -g, $(OPTFLAG)), -g)
     ADDITIONAL_FLAGS += -g