Do not redefine compiler flags that are up to build env to define

Yet another case where -D_FORTIFY_SOURCE=2 conflicts with distribution provided one. Flags like this should be up to distribution policy to define, not individual packages. (cherry picked from commit 973fe96)
QubesOS · Jun 22, 2024 · 59664fe · 59664fe
1 parent 5025d32
commit 59664fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/not-script/Makefile b/not-script/Makefile
@@ -1,5 +1,5 @@
 CC=gcc
-CFLAGS := $(CFLAGS) -g3 -O2 -Wall -Wextra -Werror -fPIE -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -Wmaybe-uninitialized
+CFLAGS += -g -O2 -Wall -Wextra -Werror -fPIE -D_GNU_SOURCE -Wmaybe-uninitialized
 .PHONY: clean install all
 all: not-script
 

diff --git a/qrexec-lib/Makefile b/qrexec-lib/Makefile
@@ -1,5 +1,5 @@
 CC=gcc
-CFLAGS := $(CFLAGS) -I. -g3 -O2 -Wall -Wextra -Werror -pie -fPIC -Wmissing-declarations -Wmissing-prototypes
+CFLAGS += -I. -g -O2 -Wall -Wextra -Werror -pie -fPIC -Wmissing-declarations -Wmissing-prototypes
 SO_VER=2
 LDFLAGS+=-Wl,--no-undefined,--as-needed,-Bsymbolic -L .
 .PHONY: all clean install check