diff --git a/build.sh b/build.sh index 4d9a9f5..639611f 100755 --- a/build.sh +++ b/build.sh @@ -81,6 +81,7 @@ mkdir -p $BUILD_DIR mkdir -p $TARGET_DIR mkdir -p $SDK_DIR +set +e require $CC require $CXX require clang @@ -92,6 +93,7 @@ require cpio require autogen require automake require libtool +set -e CLANG_TARGET_OPTION=`./oclang/check_clang_target_option.sh` diff --git a/build_gcc.sh b/build_gcc.sh index 187f40f..de8c396 100755 --- a/build_gcc.sh +++ b/build_gcc.sh @@ -6,15 +6,15 @@ export LIBRARY_PATH="" export CC=clang export CXX=clang++ -which osxcross-conf || { +which osxcross-conf &>/dev/null || { echo "you need to complete ./build.sh first, before you can start building gcc" exit 1 } -eval `osxcross-conf` - set -e +eval `osxcross-conf` + # How many concurrent jobs should be used for compiling? JOBS=`grep -c ^processor /proc/cpuinfo` @@ -35,7 +35,9 @@ function require done } +set +e require wget +set -e BASE_DIR=`pwd`