Skip to content

Commit 24087ec

Browse files
authored
Merge pull request #8 from OpenVoxProject/macos
Go back to previous method of building MacOS
2 parents 6115af0 + 3baaf6c commit 24087ec

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

Diff for: configs/components/runtime-agent.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
pkg.install do
1919
# These are dependencies of [email protected], remove symlinks from /usr/local
2020
# so our build doesn't use the wrong headers
21-
"#{platform.brew} unlink openssl libyaml"
21+
"cd /etc/homebrew && su test -c '#{platform.brew} unlink openssl libyaml'"
2222
end
2323
end
2424
end

Diff for: configs/platforms/osx-15-arm64.rb

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
plat.inherit_from_default
33

44
packages = %w[automake cmake pkg-config]
5-
plat.provision_with "/opt/homebrew/bin/brew install #{packages.join(' ')}"
5+
plat.provision_with "su test -c '/opt/homebrew/bin/brew install #{packages.join(' ')}'"
66

77
plat.output_dir File.join('apple', '15', 'PC1', 'arm64')
8-
plat.make 'sudo /usr/bin/make'
98
end

Diff for: tasks/build.rake

+2-6
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,8 @@ namespace :vox do
1212
abort 'You must provide a platform.' if args[:platform].nil? || args[:platform].empty?
1313
platform = args[:platform]
1414

15-
if platform =~ /^osx-/
16-
abort 'It appears homebrew is not installed. Install it first.' if `which brew`.empty?
17-
cmd = "bundle exec build #{project} #{platform} --engine local"
18-
else
19-
cmd = "bundle exec build #{project} #{platform} --engine docker"
20-
end
15+
engine = platform =~ /^osx-/ ? 'local' : 'docker'
16+
cmd = "bundle exec build #{project} #{platform} --engine #{engine}"
2117

2218
puts "Running #{cmd}"
2319
exitcode = nil

0 commit comments

Comments
 (0)