Skip to content

Commit acc81b7

Browse files
llvm 15.0 macos build (#234)
Co-authored-by: Johannes Müller <[email protected]>
1 parent 5ced0bc commit acc81b7

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

.circleci/config.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ version: 2
22

33
jobs:
44
omnibus_osx_llvm:
5+
resource_class: macos.x86.medium.gen2
56
macos:
6-
xcode: 12.4.0
7+
xcode: 13.4.1
78
environment:
8-
LLVM_VERSION: 10.0.0
9+
LLVM_VERSION: 15.0.7
910
MACOSX_DEPLOYMENT_TARGET: 10.11
1011
shell: /bin/bash --login -eo pipefail
1112
steps:

omnibus/config/software/llvm.rb

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name "llvm"
2-
LLVM_VERSION = (ENV['LLVM_VERSION'] || "10.0.0").strip
2+
LLVM_VERSION = (ENV['LLVM_VERSION'] || "15.0.7").strip
33
default_version LLVM_VERSION
44
skip_transitive_dependency_licensing true
55

@@ -18,7 +18,17 @@
1818
md5: "693cefdc49d618f828144486a18b473f"
1919
end
2020

21-
relative_path "llvm-#{version}.src"
21+
version "15.0.7" do
22+
source url: "https://github.com/llvm/llvm-project/releases/download/llvmorg-#{version}/llvm-project-#{version}.src.tar.xz",
23+
md5: "bac436dbd5d37e38d3da75b03629053c"
24+
end
25+
26+
if version == "15.0.7"
27+
# This is bringing the whole project because flags weren't sufficient to prevent certain parts from being fetched by the build system.
28+
relative_path "llvm-project-#{version}.src/llvm"
29+
else
30+
relative_path "llvm-#{version}.src"
31+
end
2232

2333
whitelist_file "lib/BugpointPasses.dylib"
2434
whitelist_file "lib/libLTO.dylib"
@@ -27,7 +37,7 @@
2737

2838
env = with_standard_compiler_flags(with_embedded_path)
2939

30-
llvm_build_dir = "#{build_dir}/build-llvm"
40+
llvm_build_dir = "#{project_dir}/build-llvm"
3141

3242
build do
3343
mkdir llvm_build_dir
@@ -47,9 +57,12 @@
4757
" -DLLVM_INCLUDE_TESTS=OFF" \
4858
" -DLLVM_ENABLE_Z3_SOLVER=OFF" \
4959
" -DLLVM_ENABLE_LIBXML2=OFF" \
60+
" -DLLVM_BUILD_BENCHMARKS=OFF" \
61+
" -DLLVM_INCLUDE_BENCHMARKS=OFF" \
62+
" -DLLVM_ENABLE_ZSTD=OFF" \
5063
"#{' -DPYTHON_EXECUTABLE=$(which python2.7)' if centos? }"\
5164
" #{project_dir}", env: env, cwd: llvm_build_dir
52-
command "cmake --build .", env: env, cwd: llvm_build_dir
65+
command "cmake --build . --parallel $(sysctl -n hw.logicalcpu)", env: env, cwd: llvm_build_dir
5366
command "cmake -DCMAKE_INSTALL_PREFIX=#{install_dir} -P cmake_install.cmake", env: env, cwd: llvm_build_dir
5467
command "cmake --build . --target install", env: env, cwd: llvm_build_dir
5568
end

0 commit comments

Comments
 (0)