diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2018-11-04 18:27:22 -0500 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2018-11-27 22:48:43 +1000 |
| commit | 1aaf95089a971730b1c7bcdf6fd98c0534459b01 (patch) | |
| tree | bb15dc0490be95531f9f4f7b6595cc4ecbf1cc7c | |
| parent | 926eb345c26690ca93b6483ac949612c9b53e9db (diff) | |
| download | pacman-1aaf95089a971730b1c7bcdf6fd98c0534459b01.tar.gz pacman-1aaf95089a971730b1c7bcdf6fd98c0534459b01.zip | |
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>
| -rw-r--r-- | scripts/makepkg.sh.in | 2 |
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 |