From 937977b20e02f6790d8aeb4506341e96ef888f7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20P=C3=B6chtrager?= Date: Fri, 17 Jul 2015 19:55:29 +0200 Subject: [PATCH] build_clang.sh: clean up + change default clang version to 3.6.2 --- build_clang.sh | 42 ++++++++++-------------------------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/build_clang.sh b/build_clang.sh index 49e799b..340b4a3 100755 --- a/build_clang.sh +++ b/build_clang.sh @@ -46,19 +46,11 @@ fi source $BASE_DIR/tools/trap_exit.sh MIRROR="http://llvm.org" -#MIRROR="http://archive.ubuntu.com" if [ -z "$CLANG_VERSION" ]; then - CLANG_VERSION=3.6 - CLANG_VERSION_PATCH=.1 + CLANG_VERSION=3.6.2 fi -if [[ $MIRROR == *ubuntu* ]] && [ $CLANG_VERSION_PATCH == .0 ]; then - CLANG_VERSION_PATCH= -fi - -CLANG_VERSION_MMP="${CLANG_VERSION}${CLANG_VERSION_PATCH}" - if [ -z "$INSTALLPREFIX" ]; then INSTALLPREFIX="/usr/local" fi @@ -93,31 +85,17 @@ fi pushd $TARBALL_DIR &>/dev/null -if [[ $MIRROR == *ubuntu* ]]; then - - LLVM_PKG="$MIRROR/ubuntu/pool/main/l/llvm-toolchain-${CLANG_VERSION}/" - LLVM_PKG+="llvm-toolchain-${CLANG_VERSION}_${CLANG_VERSION_MMP}" - LLVM_PKG+=".orig.tar.bz2" - - CLANG_PKG="$MIRROR/ubuntu/pool/main/l/llvm-toolchain-${CLANG_VERSION}/" - CLANG_PKG+="llvm-toolchain-${CLANG_VERSION}_${CLANG_VERSION_MMP}" - CLANG_PKG+=".orig-clang.tar.bz2" - -else - - if [ -z "$PKGCOMPRESSOR" ]; then - PKGCOMPRESSOR="tar.xz" - [ $CLANG_VERSION == "3.4" ] && PKGCOMPRESSOR="tar.gz" - fi - - LLVM_PKG="$MIRROR/releases/${CLANG_VERSION_MMP}/" - LLVM_PKG+="llvm-${CLANG_VERSION_MMP}.src.${PKGCOMPRESSOR}" - - CLANG_PKG="$MIRROR/releases/${CLANG_VERSION_MMP}/" - CLANG_PKG+="cfe-${CLANG_VERSION_MMP}.src.${PKGCOMPRESSOR}" - +if [ -z "$PKGCOMPRESSOR" ]; then + PKGCOMPRESSOR="tar.xz" + [ $CLANG_VERSION == "3.4" ] && PKGCOMPRESSOR="tar.gz" fi +LLVM_PKG="$MIRROR/releases/${CLANG_VERSION}/" +LLVM_PKG+="llvm-${CLANG_VERSION}.src.${PKGCOMPRESSOR}" + +CLANG_PKG="$MIRROR/releases/${CLANG_VERSION}/" +CLANG_PKG+="cfe-${CLANG_VERSION}.src.${PKGCOMPRESSOR}" + wget -c $LLVM_PKG wget -c $CLANG_PKG