Skip to content

Fix llvm package builds on aarch64 runner #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 3, 2024
Merged

Fix llvm package builds on aarch64 runner #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13969f0
Force update `ffi-yajl >=2.6
straight-shoota Jul 1, 2024
756f889
Drop `resource_class`
straight-shoota Jul 1, 2024
ccf1646
Drop `install` target for llvm
straight-shoota Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ version: 2

jobs:
omnibus_osx_llvm:
resource_class: macos.x86.medium.gen2
macos:
xcode: 13.4.1
environment:
Expand Down
2 changes: 2 additions & 0 deletions omnibus/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ end

gem 'omnibus', github: 'chef/omnibus', ref: '1d97cd9e79a062dfc12f0c047215f3a9e4d65b09'
gem 'omnibus-software', github: 'chef/omnibus-software', ref: '76b31d11c1fbbc43a4ed1a1990a2662d05b28644'

gem 'ffi-yajl', '>=2.6'
2 changes: 1 addition & 1 deletion omnibus/config/software/llvm.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@
"#{' -DPYTHON_EXECUTABLE=$(which python2.7)' if centos? }"\
" #{project_dir}", env: env, cwd: llvm_build_dir
command "cmake --build . --parallel $(sysctl -n hw.logicalcpu)", env: env, cwd: llvm_build_dir
command "cmake --build . --target preinstall", env: env, cwd: llvm_build_dir
command "cmake -DCMAKE_INSTALL_PREFIX=#{install_dir} -P cmake_install.cmake", env: env, cwd: llvm_build_dir
command "cmake --build . --target install", env: env, cwd: llvm_build_dir
end