moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

gcc: remove bootstrap path change in do_build()

Browse source
This commit is contained in:
davehome 2011-10-17 16:33:11 +00:00
parent 51ab4a9890
commit c2c7a3f456
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
srcpkgs/gcc/template
View file

@ -66,7 +66,6 @@ fi
do_configure() do_configure()
{ {
set +e
if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
unset LD_LIBRARY_PATH LDLIBPATH LDFLAGS CPPFLAGS unset LD_LIBRARY_PATH LDLIBPATH LDFLAGS CPPFLAGS
local SAVEDPATH=$PATH local SAVEDPATH=$PATH
@ -90,19 +89,19 @@ do_configure()
--enable-checking=release --enable-checking=release
[ -n "$BOOTSTRAP_PKG_REBUILD" ] && export PATH=$SAVEDPATH [ -n "$BOOTSTRAP_PKG_REBUILD" ] && export PATH=$SAVEDPATH
set -e
} }
do_build() do_build()
{ {
if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then set +e
unset LD_LIBRARY_PATH LDLIBPATH LDFLAGS CPPFLAGS # if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
local SAVEDPATH=$PATH # unset LD_LIBRARY_PATH LDLIBPATH LDFLAGS CPPFLAGS
export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin" # local SAVEDPATH=$PATH
fi # export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
# fi
make ${makejobs} make ${makejobs} || return 1
[ -n "$BOOTSTRAP_PKG_REBUILD" ] && export PATH=$SAVEDPATH # [ -n "$BOOTSTRAP_PKG_REBUILD" ] && export PATH=$SAVEDPATH
} }
do_install() do_install()