diff options
| -rwxr-xr-x | llvm/utils/crosstool/ARM/build-install-linux.sh | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/llvm/utils/crosstool/ARM/build-install-linux.sh b/llvm/utils/crosstool/ARM/build-install-linux.sh index 9b33c8a4e94..f3f8df96630 100755 --- a/llvm/utils/crosstool/ARM/build-install-linux.sh +++ b/llvm/utils/crosstool/ARM/build-install-linux.sh @@ -9,7 +9,7 @@ set -o errexit echo -n "Welcome to LLVM Linux/X86_64 -> Linux/ARM crosstool " echo "builder/installer; some steps will require sudo privileges." -readonly INSTALL_ROOT="${INSTALL_ROOT:-/usr/local}" +readonly INSTALL_ROOT="${INSTALL_ROOT:-/usr/local/crosstool}" # Both $USER and root *must* have read/write access to this dir. readonly SCRATCH_ROOT=$(mktemp -d "${TMPDIR:-/tmp}/llvm-project.XXXXXX") readonly SRC_ROOT="${SCRATCH_ROOT}/src" @@ -33,33 +33,23 @@ readonly CROSS_TARGET_LD="${CODE_SOURCERY_BIN}/${CROSS_TARGET}-ld" readonly SYSROOT="${CODE_SOURCERY_ROOT}/${CROSS_TARGET}/libc" -readonly LLVM_PROJECT="${INSTALL_ROOT}/llvm-project" -readonly LLVM_INSTALL_ROOT="${LLVM_PROJECT}/${CROSS_HOST}/${CROSS_TARGET}" readonly LLVM_PKG_PATH="${LLVM_PKG_PATH:-${HOME}/llvm-project/snapshots}" -# Latest SVN revision known to be working in this configuration. -readonly LLVM_DEFAULT_REV="70786" +# Latest SVN revisions known to be working in this configuration. +readonly LLVM_DEFAULT_REV="74530" +readonly LLVMGCC_DEFAULT_REV="74535" readonly LLVM_PKG="llvm-${LLVM_SVN_REV:-${LLVM_DEFAULT_REV}}.tar.bz2" readonly LLVM_SRC_DIR="${SRC_ROOT}/llvm" readonly LLVM_OBJ_DIR="${OBJ_ROOT}/llvm" -readonly LLVM_INSTALL_DIR="${LLVM_INSTALL_ROOT}/llvm" +readonly LLVM_INSTALL_DIR="${INSTALL_ROOT}/${CROSS_TARGET}/llvm" -readonly LLVMGCC_PKG="llvm-gcc-4.2-${LLVMGCC_SVN_REV:-${LLVM_DEFAULT_REV}}.tar.bz2" +readonly LLVMGCC_PKG="llvm-gcc-4.2-${LLVMGCC_SVN_REV:-${LLVMGCC_DEFAULT_REV}}.tar.bz2" readonly LLVMGCC_SRC_DIR="${SRC_ROOT}/llvm-gcc-4.2" readonly LLVMGCC_OBJ_DIR="${OBJ_ROOT}/llvm-gcc-4.2" -readonly LLVMGCC_INSTALL_DIR="${LLVM_INSTALL_ROOT}/llvm-gcc-4.2" +readonly LLVMGCC_INSTALL_DIR="${INSTALL_ROOT}/${CROSS_TARGET}/llvm-gcc-4.2" -readonly MAKE_OPTS="-j2" - -# Verify we aren't going to install into an existing directory as this might -# create problems as we won't have a clean install. -verifyNotDir() { - if [[ -d $1 ]]; then - echo "Install dir $1 already exists; remove it to continue." - exit - fi -} +readonly MAKE_OPTS="${MAKE_OPTS:--j2}" # Params: # $1: directory to be created |
