[build] Update hack that broke when running benchmarks/ovm-build

I moved from ~/git/oilshell/oil -> ~/git/oils-for-unix/oils
oils-for-unix · Jan 6, 2025 · 871e087 · 871e087
1 parent a0b296d
commit 871e087
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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=''