Skip to content

Commit 781b509

Browse files
committed
Use native compilation for macos-all-x86_64
The experiment to use Rosetta on an arm64 host to build macos-all-x86_64 didn't quite work out, so we're going to build on native x86_64 hosts instead.
1 parent 5b8f4c0 commit 781b509

File tree

3 files changed

+0
-14
lines changed

3 files changed

+0
-14
lines changed

packaging/configs/components/pl-ruby-patch.rb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88
# This component should also be present in the puppet-runtime project
99
component "pl-ruby-patch" do |pkg, settings, platform|
1010
if platform.is_cross_compiled?
11-
if platform.is_macos?
12-
pkg.build_requires 'gnu-sed'
13-
pkg.environment "PATH", "/usr/local/opt/gnu-sed/libexec/gnubin:$(PATH)"
14-
end
15-
1611
ruby_api_version = settings[:ruby_version].gsub(/\.\d*$/, '.0')
1712
ruby_version_y = settings[:ruby_version].gsub(/(\d+)\.(\d+)\.(\d+)/, '\1.\2')
1813

@@ -26,8 +21,6 @@
2621
"powerpc64le-linux"
2722
elsif platform.name == 'solaris-11-sparc'
2823
"sparc-solaris-2.11"
29-
elsif platform.is_macos?
30-
"aarch64-darwin"
3124
else
3225
"#{platform.architecture}-linux"
3326
end

packaging/configs/components/puppet-runtime.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
pkg.build_requires 'pl-ruby'
2222
elsif platform.is_linux?
2323
pkg.build_requires 'pl-ruby'
24-
elsif platform.is_macos?
25-
ruby_version_y = settings[:ruby_version].gsub(/(\d+)\.(\d+)\.(\d+)/, '\1.\2')
26-
pkg.build_requires "ruby@#{ruby_version_y}"
2724
end
2825
end
2926

tasks/build.rake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ namespace :vox do
1111
abort 'You must provide a platform.' if args[:platform].nil? || args[:platform].empty?
1212
platform = args[:platform]
1313
os, _ver, arch = platform.match(/^(\w+)-([\w|\.]+)-(\w+)$/).captures
14-
if os == 'macos'
15-
abort "You must run this build from a #{arch} machine or shell. To do this on the current host, run 'arch -#{arch} /bin/bash'" if `uname -m`.chomp != arch
16-
abort "You must run this build with a #{arch} Ruby version. To do this on the current host, install Ruby from an #{arch} shell via 'arch -#{arch} /bin/bash'." unless `ruby -v`.chomp =~ /#{arch}/
17-
end
1814

1915
engine = platform =~ /^(macos|windows)-/ ? 'local' : 'docker'
2016
cmd = "bundle exec build #{project} #{platform} --engine #{engine}"

0 commit comments

Comments
 (0)