From 59664fe6e458122017705d3af23bf8b2e5c0d2b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sat, 22 Jun 2024 11:25:54 +0200 Subject: [PATCH] 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 973fe966db32abbdd099f59d95078b53de6f6ae3) --- not-script/Makefile | 2 +- qrexec-lib/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/not-script/Makefile b/not-script/Makefile index e639b97..f57e410 100644 --- 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 index 399664c..22eb2de 100644 --- 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