mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
Fix FS #6872- CFLAGS are not used
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
1c2358532f
commit
dde2f3eefa
@ -901,7 +901,7 @@ else
|
|||||||
[ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH
|
[ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH
|
||||||
elif [ "$(check_option distcc)" = "n" ]; then
|
elif [ "$(check_option distcc)" = "n" ]; then
|
||||||
# if it is not wanted, clear the makeflags too
|
# if it is not wanted, clear the makeflags too
|
||||||
export MAKEFLAGS=""
|
MAKEFLAGS=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# use ccache if it is requested (check buildenv and PKGBUILD opts)
|
# use ccache if it is requested (check buildenv and PKGBUILD opts)
|
||||||
@ -911,7 +911,7 @@ else
|
|||||||
|
|
||||||
# clear user-specified makeflags if requested
|
# clear user-specified makeflags if requested
|
||||||
if [ "$(check_option makeflags)" = "n" ]; then
|
if [ "$(check_option makeflags)" = "n" ]; then
|
||||||
export MAKEFLAGS=""
|
MAKEFLAGS=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# build
|
# build
|
||||||
@ -921,6 +921,11 @@ else
|
|||||||
unset LC_ALL LANG
|
unset LC_ALL LANG
|
||||||
umask 0022
|
umask 0022
|
||||||
|
|
||||||
|
# ensure CFLAGS and CXXFLAGS are used
|
||||||
|
export CFLAGS
|
||||||
|
export CXXFLAGS
|
||||||
|
export MAKEFLAGS
|
||||||
|
|
||||||
#check for "exit on syntax error" shell option
|
#check for "exit on syntax error" shell option
|
||||||
echo $SHELLOPTS | grep errexit 2>&1 >/dev/null
|
echo $SHELLOPTS | grep errexit 2>&1 >/dev/null
|
||||||
set_e=$?
|
set_e=$?
|
||||||
|
Loading…
Reference in New Issue
Block a user