Handle new LLVM version path

In #399, @glandium points out that newer versions of LLVM will place
their version information at a different path. This change adapts #399
to the new Python version script.
pull/403/head
Andrew Brown 10 months ago
parent c376c9cfbd
commit a50a641f4b

@ -5,9 +5,10 @@
# #
# Usage: version [wasi-sdk|llvm|llvm-major|dump] [--llvm-dir=<non-project dir>] # Usage: version [wasi-sdk|llvm|llvm-major|dump] [--llvm-dir=<non-project dir>]
import sys
import argparse import argparse
import os
import subprocess import subprocess
import sys
# The number of characters to use for the abbreviated Git revision. # The number of characters to use for the abbreviated Git revision.
GIT_REF_LEN = 12 GIT_REF_LEN = 12
@ -75,7 +76,11 @@ def parse_cmake_set(line):
def llvm_cmake_version(llvm_dir): def llvm_cmake_version(llvm_dir):
with open(f'{llvm_dir}/llvm/CMakeLists.txt') as file: path = f'{llvm_dir}/cmake/Modules/LLVMVersion.cmake'
if not os.path.exists(path):
# Handle older LLVM versions; see #399.
path = f'{llvm_dir}/llvm/CMakeLists.txt'
with open(path) as file:
for line in file: for line in file:
line = line.strip() line = line.strip()
if line.startswith('set(LLVM_VERSION_MAJOR'): if line.startswith('set(LLVM_VERSION_MAJOR'):

Loading…
Cancel
Save