From 871e0876223ae4f94e116da6c31d7b7c933054e8 Mon Sep 17 00:00:00 2001 From: Andy C Date: Sun, 5 Jan 2025 22:36:39 -0500 Subject: [PATCH] [build] Update hack that broke when running benchmarks/ovm-build I moved from ~/git/oilshell/oil -> ~/git/oils-for-unix/oils --- benchmarks/ovm-build.sh | 2 +- build/common.sh | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/benchmarks/ovm-build.sh b/benchmarks/ovm-build.sh index 5089f24f13..0ffc052342 100755 --- a/benchmarks/ovm-build.sh +++ b/benchmarks/ovm-build.sh @@ -233,7 +233,7 @@ build-task() { compiler='cxx' ;; (*clang) - # Note on slight mess: benchmarks/id.sh takes the provenanec of + # Note on slight mess: benchmarks/id.sh takes the provenance of # $CLANG. We translate that to 'clang' here, and # _build/oils.sh uses $CLANGXX. compiler='clang' diff --git a/build/common.sh b/build/common.sh index d54c439b7a..a1c0320818 100644 --- a/build/common.sh +++ b/build/common.sh @@ -21,7 +21,12 @@ LLVM_VERSION=14.0.0 readonly CLANG_DIR_RELATIVE="../oil_DEPS/clang+llvm-$LLVM_VERSION-x86_64-linux-gnu-ubuntu-18.04" CLANG_DIR_1=$REPO_ROOT/$CLANG_DIR_RELATIVE -CLANG_DIR_FALLBACK=~/git/oilshell/oil/$CLANG_DIR_RELATIVE + +# When building tarballs for devtools/release.sh, $REPO_ROOT is not next to +# ../oil_DEPS, so add this fallback. +# TODO/BUG: Shouldn't hard-code the absolute path! +CLANG_DIR_FALLBACK=~/git/oils-for-unix/oils/$CLANG_DIR_RELATIVE + if test -d $CLANG_DIR_1; then CLANG_DIR=$CLANG_DIR_1 CLANG_IS_MISSING=''