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 <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>

1 files changed, 1 insertions, 1 deletions

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