From 746a6a42dd8d3974e6eca6b362d5a7bc3af47182 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20P=C3=B6chtrager?= <t.poechtrager@gmail.com>
Date: Tue, 11 Nov 2014 22:54:03 +0100
Subject: [PATCH] build_clang.sh should not depend on a finished build.sh run

---
 build_clang.sh | 21 ++++++++++++---------
 tools/tools.sh |  4 ++--
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/build_clang.sh b/build_clang.sh
index fc97302..9137959 100755
--- a/build_clang.sh
+++ b/build_clang.sh
@@ -7,8 +7,11 @@ USESYSTEMCOMPILER=1
 
 source tools/tools.sh
 
+TARBALL_DIR=$BASE_DIR/tarballs
+BUILD_DIR=$BASE_DIR/build
+
 if [ -z "$SKIP_GCC_CHECK" ]; then
-if [ $PLATFORM != "Darwin" -a "$PLATFORM" != "FreeBSD" ]; then
+if [ $PLATFORM != "Darwin" -a $PLATFORM != "FreeBSD" ]; then
   which "g++${GCC_SUFFIX}" &>/dev/null && \
   {
     export CC="gcc${GCC_SUFFIX}"
@@ -72,7 +75,7 @@ function warn_if_installed()
   }
 }
 
-if [ $PLATFORM != "Darwin" -a "$PLATFORM" != "FreeBSD" ]; then
+if [ $PLATFORM != "Darwin" -a $PLATFORM != "FreeBSD" ]; then
   warn_if_installed clang clang
   warn_if_installed llvm-config llvm
 fi
@@ -82,9 +85,7 @@ echo "Installation Prefix: $INSTALLPREFIX"
 read -p "Press enter to start building."
 echo ""
 
-pushd $OSXCROSS_BUILD_DIR &>/dev/null
-
-pushd $OSXCROSS_TARBALL_DIR &>/dev/null
+pushd $TARBALL_DIR &>/dev/null
 
 if [[ $MIRROR == *ubuntu* ]]; then
 
@@ -113,18 +114,21 @@ fi
 
 wget -c $LLVM_PKG
 wget -c $CLANG_PKG
+
 popd &>/dev/null
 
+pushd $BUILD_DIR &>/dev/null
+
 echo "cleaning up ..."
 
 rm -rf llvm* 2>/dev/null
 
-extract "$OSXCROSS_TARBALL_DIR/$(basename $LLVM_PKG)" 2 0
+extract "$TARBALL_DIR/$(basename $LLVM_PKG)" 2 0
 
 pushd llvm* &>/dev/null
 pushd tools &>/dev/null
 
-extract "$OSXCROSS_TARBALL_DIR/$(basename $CLANG_PKG)" 1
+extract "$TARBALL_DIR/$(basename $CLANG_PKG)" 1
 [ -e clang* ] && mv clang* clang
 [ -e cfe* ] && mv cfe* clang
 
@@ -143,8 +147,7 @@ function build()
 if [ -n "$DISABLE_BOOTSTRAP" ]; then
   build build
 else
-  CFLAGS="-O1" CXXFLAGS="-O1" \
-    build build_stage1 clang-only
+  build build_stage1 clang-only
 
   export CC=$PWD/build_stage1/Release/bin/clang
   export CXX=$PWD/build_stage1/Release/bin/clang++
diff --git a/tools/tools.sh b/tools/tools.sh
index b15045c..f75f6fa 100755
--- a/tools/tools.sh
+++ b/tools/tools.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BASE_DIR=`pwd`
+BASE_DIR=$PWD
 
 export LC_ALL="C"
 
@@ -22,7 +22,7 @@ if [[ $PSCRIPT != *wrapper/build.sh ]]; then
   # how many concurrent jobs should be used for compiling?
   JOBS=${JOBS:=`tools/get_cpu_count.sh`}
 
-  if [ $PSCRIPT != "build.sh" ]; then
+  if [ $PSCRIPT != "build.sh" -a "$PSCRIPT" != "build_clang.sh" ]; then
     `tools/osxcross_conf.sh`
 
     if [ $? -ne 0 ]; then