From a772ff13545aef0b20f950889fb023b1fc770019 Mon Sep 17 00:00:00 2001 From: Sebastian Miasojed Date: Thu, 21 Nov 2024 10:29:21 +0100 Subject: [PATCH] Fix build path --- .gitignore | 1 + build-llvm.sh | 4 ++-- emscripten-build-llvm.sh | 7 +++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 1d336dc..142c03e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ tmp package-lock.json /*.html /js/resolc.* +/build diff --git a/build-llvm.sh b/build-llvm.sh index e84945d..26ba75a 100755 --- a/build-llvm.sh +++ b/build-llvm.sh @@ -8,7 +8,7 @@ mkdir -p ${INSTALL_DIR} # Build LLVM, clang LLVM_SRC_PREFIX=${PWD}/llvm-project LLVM_SRC_DIR=${LLVM_SRC_PREFIX}/llvm -LLVM_BUILD_DIR=${LLVM_SRC_PREFIX}/build/llvm +LLVM_BUILD_DIR=${PWD}/build/llvm ./clone-llvm.sh "${LLVM_SRC_PREFIX}" @@ -34,7 +34,7 @@ cmake --install ${LLVM_BUILD_DIR} # Build compiler builtins COMPILER_RT_SRC_DIR=${LLVM_SRC_PREFIX}/compiler-rt -COMPILER_RT_BUILD_DIR=${LLVM_SRC_PREFIX}/build/compiler-rt +COMPILER_RT_BUILD_DIR=${PWD}/build/compiler-rt if [ ! -d ${COMPILER_RT_BUILD_DIR} ] ; then mkdir -p ${COMPILER_RT_BUILD_DIR} fi diff --git a/emscripten-build-llvm.sh b/emscripten-build-llvm.sh index 48c47db..72fe82c 100755 --- a/emscripten-build-llvm.sh +++ b/emscripten-build-llvm.sh @@ -14,10 +14,9 @@ fi source "${EMSDK_ROOT}/emsdk_env.sh" -LLVM_SRC=$(pwd)/llvm-project -LLVM_SRC=$(realpath "$LLVM_SRC") -LLVM_NATIVE="${LLVM_SRC}/build-native" -LLVM_WASM="${LLVM_SRC}/build-wasm" +LLVM_SRC=$(PWD)/llvm-project +LLVM_NATIVE="${PWD}/build/llvm-tools" +LLVM_WASM="${PWD}/build/llvm-wasm" ./clone-llvm.sh "${LLVM_SRC}"