Skip to content

Commit

Permalink
Bug 1884838 - Support getting LLVM version from its new location. r=f…
Browse files Browse the repository at this point in the history
…irefox-build-system-reviewers,ahochheiden

Patch sent upstream: WebAssembly/wasi-sdk#399

Differential Revision: https://phabricator.services.mozilla.com/D204328
  • Loading branch information
glandium committed Mar 12, 2024
1 parent c8bea27 commit 685c362
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions taskcluster/scripts/misc/wasi-sdk.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
diff --git a/llvm_version_major.sh b/llvm_version_major.sh
index 2e5d973..93fe9b0 100755
--- a/llvm_version_major.sh
+++ b/llvm_version_major.sh
@@ -1,4 +1,4 @@
#/bin/bash
LLVM_PROJ_DIR=${1:-./src/llvm-project}
-MAJOR=`grep "set(LLVM_VERSION_MAJOR" $LLVM_PROJ_DIR/llvm/CMakeLists.txt | awk '{print substr($2, 1, length($2) - 1)}'`
+MAJOR=`(grep "set(LLVM_VERSION_MAJOR" $LLVM_PROJ_DIR/llvm/CMakeLists.txt || grep "set(LLVM_VERSION_MAJOR" $LLVM_PROJ_DIR/cmake/Modules/LLVMVersion.cmake) | awk '{print substr($2, 1, length($2) - 1)}'`
echo $MAJOR
diff --git a/Makefile b/Makefile
index d2ccff6..95f395b 100644
--- a/Makefile
Expand Down

0 comments on commit 685c362

Please sign in to comment.