diff options
| author | Dan McGee <dan@archlinux.org> | 2007-04-11 18:44:42 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-04-11 18:44:42 +0200 |
| commit | dde2f3eefa323b0904a53aded51552700de21f72 (patch) | |
| tree | 0f00dbe3742187b4b9b9c0003c96cb819f4a1485 /scripts | |
| parent | 1c2358532fac7588927f5bdf122493e4cc4fb9f8 (diff) | |
| download | pacman-dde2f3eefa323b0904a53aded51552700de21f72.tar.gz pacman-dde2f3eefa323b0904a53aded51552700de21f72.tar.xz | |
Fix FS #6872- CFLAGS are not used
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/makepkg.in | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/makepkg.in b/scripts/makepkg.in index cd0b8e6a..ba62a2db 100755 --- a/scripts/makepkg.in +++ b/scripts/makepkg.in @@ -901,7 +901,7 @@ else [ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH elif [ "$(check_option distcc)" = "n" ]; then # if it is not wanted, clear the makeflags too - export MAKEFLAGS="" + MAKEFLAGS="" fi # use ccache if it is requested (check buildenv and PKGBUILD opts) @@ -911,7 +911,7 @@ else # clear user-specified makeflags if requested if [ "$(check_option makeflags)" = "n" ]; then - export MAKEFLAGS="" + MAKEFLAGS="" fi # build @@ -921,6 +921,11 @@ else unset LC_ALL LANG umask 0022 + # ensure CFLAGS and CXXFLAGS are used + export CFLAGS + export CXXFLAGS + export MAKEFLAGS + #check for "exit on syntax error" shell option echo $SHELLOPTS | grep errexit 2>&1 >/dev/null set_e=$? |