sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildgcc: Don't use BUILDDIRPREFIX

Browse Source 
Change-Id: I7be9b39a0d92882fa437f666d7f4a85e6f0a23f6
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/10489
Tested-by: build bot (Jenkins)
Reviewed-by: Alexander Couzens <lynxis@fe80.eu>
This commit is contained in:
Stefan Reinauer
2015-06-09 12:21:42 -07:00
parent 1c70e052aa
commit 05bbc9208a
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
util/crossgcc/buildgcc
View File

@ -242,27 +242,29 @@ fn_exists()
build() { build() {
package=$1 package=$1
version="$(eval echo \$$package"_VERSION")"
fn_exists build_$package || return fn_exists build_$package || return
mkdir -p ${BUILDDIRPREFIX}-$package version="$(eval echo \$$package"_VERSION")"
BUILDDIR=build-${TARGETARCH}-$package
mkdir -p ${BUILDDIR}
[[ "$PACKAGES" == *$package* ]] && \ [[ "$PACKAGES" == *$package* ]] && \
if [ -f ${BUILDDIRPREFIX}-$package/.success ]; then if [ -f ${BUILDDIR}/.success ]; then
printf "Skipping $package as it is already built\n" printf "Skipping $package as it is already built\n"
else else
printf "Building $package $version ... " printf "Building $package $version ... "
DIR=$PWD DIR=$PWD
cd ${BUILDDIRPREFIX}-$package cd ${BUILDDIR}
rm -f .failed rm -f .failed
build_${package} > build.log 2>&1 build_${package} > build.log 2>&1
cd $DIR/${BUILDDIRPREFIX}-$package cd $DIR/${BUILDDIR}
if [ ! -f .failed ]; then touch .success; fi if [ ! -f .failed ]; then touch .success; fi
cd .. cd ..
if [ -r "${BUILDDIRPREFIX}-$package/.failed" ]; then if [ -r "${BUILDDIR}/.failed" ]; then
printf "${RED}failed${NC}. Check ${BUILDDIRPREFIX}-$package/build.log.\n" printf "${RED}failed${NC}. Check ${BUILDDIR}/build.log.\n"
exit 1 exit 1
fi fi
printf "${green}ok${NC}\n" printf "${green}ok${NC}\n"
@ -273,7 +275,7 @@ cleanup()
{ {
printf "Cleaning up temporary files... " printf "Cleaning up temporary files... "
for package in $PACKAGES; do for package in $PACKAGES; do
rm -rf ${BUILDDIRPREFIX}-$package $(eval echo \$$package"_DIR") rm -rf build-${TARGETARCH}-$package $(eval echo \$$package"_DIR")
done done
printf "${green}ok${NC}\n" printf "${green}ok${NC}\n"
} }
@ -537,9 +539,6 @@ NAME=clang
PACKAGES="LLVM CFE CRT CTE" PACKAGES="LLVM CFE CRT CTE"
fi fi
BUILDDIRPREFIX=build-${TARGETARCH}
BUILDDIR=$PWD/build-clang
if [ "$clean" = "1" ]; then if [ "$clean" = "1" ]; then
cleanup cleanup
fi fi