Relintai/osxcross
1
0
Fork 0
mirror of https://github.com/Relintai/osxcross.git synced 2025-04-11 17:32:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

build_clang.sh should not depend on a finished build.sh run

Browse Source
This commit is contained in:
Thomas Pöchtrager 2014-11-11 22:54:03 +01:00
parent e8443ae7d3
commit 746a6a42dd
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build_clang.sh
View File

@ -7,8 +7,11 @@ USESYSTEMCOMPILER=1
source tools/tools.sh source tools/tools.sh
TARBALL_DIR=$BASE_DIR/tarballs
BUILD_DIR=$BASE_DIR/build
if [ -z "$SKIP_GCC_CHECK" ]; then 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 && \ which "g++${GCC_SUFFIX}" &>/dev/null && \
{ {
export CC="gcc${GCC_SUFFIX}" 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 clang clang
warn_if_installed llvm-config llvm warn_if_installed llvm-config llvm
fi fi
@ -82,9 +85,7 @@ echo "Installation Prefix: $INSTALLPREFIX"
read -p "Press enter to start building." read -p "Press enter to start building."
echo "" echo ""
pushd $OSXCROSS_BUILD_DIR &>/dev/null pushd $TARBALL_DIR &>/dev/null
pushd $OSXCROSS_TARBALL_DIR &>/dev/null
if [[ $MIRROR == *ubuntu* ]]; then if [[ $MIRROR == *ubuntu* ]]; then
@ -113,18 +114,21 @@ fi
wget -c $LLVM_PKG wget -c $LLVM_PKG
wget -c $CLANG_PKG wget -c $CLANG_PKG
popd &>/dev/null popd &>/dev/null
pushd $BUILD_DIR &>/dev/null
echo "cleaning up ..." echo "cleaning up ..."
rm -rf llvm* 2>/dev/null 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 llvm* &>/dev/null
pushd tools &>/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 clang* ] && mv clang* clang
[ -e cfe* ] && mv cfe* clang [ -e cfe* ] && mv cfe* clang
@ -143,8 +147,7 @@ function build()
if [ -n "$DISABLE_BOOTSTRAP" ]; then if [ -n "$DISABLE_BOOTSTRAP" ]; then
build build build build
else else
CFLAGS="-O1" CXXFLAGS="-O1" \ build build_stage1 clang-only
build build_stage1 clang-only
export CC=$PWD/build_stage1/Release/bin/clang export CC=$PWD/build_stage1/Release/bin/clang
export CXX=$PWD/build_stage1/Release/bin/clang++ export CXX=$PWD/build_stage1/Release/bin/clang++

4
tools/tools.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
BASE_DIR=`pwd` BASE_DIR=$PWD
export LC_ALL="C" export LC_ALL="C"
@ -22,7 +22,7 @@ if [[ $PSCRIPT != *wrapper/build.sh ]]; then
# how many concurrent jobs should be used for compiling? # how many concurrent jobs should be used for compiling?
JOBS=${JOBS:=`tools/get_cpu_count.sh`} 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` `tools/osxcross_conf.sh`
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then