Skip to content

Commit c3e0d25

Browse files
Fix llvm package builds on aarch64 runner (#319)
Force update `ffi-yajl >=2.6 Drop `resource_class` Drop `install` target for llvm
1 parent fe82a34 commit c3e0d25

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

.circleci/config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ version: 2
22

33
jobs:
44
omnibus_osx_llvm:
5-
resource_class: macos.x86.medium.gen2
65
macos:
76
xcode: 13.4.1
87
environment:

omnibus/Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ end
77

88
gem 'omnibus', github: 'chef/omnibus', ref: '1d97cd9e79a062dfc12f0c047215f3a9e4d65b09'
99
gem 'omnibus-software', github: 'chef/omnibus-software', ref: '76b31d11c1fbbc43a4ed1a1990a2662d05b28644'
10+
11+
gem 'ffi-yajl', '>=2.6'

omnibus/config/software/llvm.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,6 @@
6363
"#{' -DPYTHON_EXECUTABLE=$(which python2.7)' if centos? }"\
6464
" #{project_dir}", env: env, cwd: llvm_build_dir
6565
command "cmake --build . --parallel $(sysctl -n hw.logicalcpu)", env: env, cwd: llvm_build_dir
66+
command "cmake --build . --target preinstall", env: env, cwd: llvm_build_dir
6667
command "cmake -DCMAKE_INSTALL_PREFIX=#{install_dir} -P cmake_install.cmake", env: env, cwd: llvm_build_dir
67-
command "cmake --build . --target install", env: env, cwd: llvm_build_dir
6868
end

0 commit comments

Comments
 (0)