diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2011-09-06 09:29:52 -0400 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-09-06 08:45:44 -0500 |
| commit | 29ad9e0a0a93a60a1118eb0e8cb6a14df147320f (patch) | |
| tree | 7d3deea2b64d7fd2505202295491f7e43c9465b2 | |
| parent | 7ed54a99401f7a16edcba27725e92fb7474be240 (diff) | |
| download | pacman-29ad9e0a0a93a60a1118eb0e8cb6a14df147320f.tar.xz | |
makepkg: unset variables as per !{make,build}flags
Don't just set the flag variables to zero length strings, actually unset
them from the environment. This fixes issues with broken gnu Makefies
that use ?= for assigment, where the presence of a var is enough to make
this condition avoid assignment.
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2f06b9b3..3174b0c7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -864,14 +864,12 @@ run_function() { # clear user-specified buildflags if requested if [[ $(check_option buildflags) = "n" ]]; then - CFLAGS="" - CXXFLAGS="" - LDFLAGS="" + unset CFLAGS CXXFLAGS LDFLAGS fi # clear user-specified makeflags if requested if [[ $(check_option makeflags) = "n" ]]; then - MAKEFLAGS="" + unset MAKEFLAGS fi msg "$(gettext "Starting %s()...")" "$pkgfunc" |