From 1aaf95089a971730b1c7bcdf6fd98c0534459b01 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Sun, 4 Nov 2018 18:27:22 -0500 Subject: makepkg: if "!buildflags" and "debug" coincide, unset the debug buildflags too If a user has a makepkg.conf policy to enable debug builds, but a PKGBUILD has disabled buildflags, we would unset the *FLAGS but then later append the debug *FLAGS anyway, which would result in some *FLAGS being used, against the wishes of the PKGBUILD author. Signed-off-by: Eli Schwartz Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3ac03d11..9365801c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -383,7 +383,7 @@ source_buildfile() { prepare_buildenv() { # clear user-specified buildflags if requested if check_option "buildflags" "n"; then - unset CPPFLAGS CFLAGS CXXFLAGS LDFLAGS + unset CPPFLAGS CFLAGS DEBUG_CFLAGS CXXFLAGS DEBUG_CXXFLAGS LDFLAGS fi if check_option "debug" "y"; then -- cgit v1.2.3-70-g09d2