Skip to content

Commit e918362

Browse files
obladorfacebook-github-bot
authored andcommitted
Fix Rosetta2 CocoaPods warning on Apple Silicon (#32498)
Summary: The current warning assumes the ruby binary to be single arch, but the ruby version shipping with macOS is universal `universal.arm64e-darwin20`. This PR changes the check to search for `arm64` in any position instead of just the beginning to fix false positives. ## Changelog [iOS] [Fixed] - Fix Rosetta2 CocoaPods warning on Apple Silicon Pull Request resolved: #32498 Test Plan: ### Before On M1 Mac `pod install` using system ruby always yields a warning. ### After `pod install` does not yield a warning. `arch -x86_64 pod install` yields a warning. Reviewed By: fkgozali Differential Revision: D32013176 Pulled By: sota000 fbshipit-source-id: 84f517c210318b5d073d161b6849b9aee367bba6
1 parent 3b7044d commit e918362

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

scripts/react_native_pods.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def use_react_native! (options={})
2121
# Include Hermes dependencies
2222
hermes_enabled = options[:hermes_enabled] ||= false
2323

24-
if `/usr/sbin/sysctl -n hw.optional.arm64 2>&1`.to_i == 1 && !RUBY_PLATFORM.start_with?('arm64')
24+
if `/usr/sbin/sysctl -n hw.optional.arm64 2>&1`.to_i == 1 && !RUBY_PLATFORM.include?('arm64')
2525
Pod::UI.warn 'Do not use "pod install" from inside Rosetta2 (x86_64 emulation on arm64).'
2626
Pod::UI.warn ' - Emulated x86_64 is slower than native arm64'
2727
Pod::UI.warn ' - May result in mixed architectures in rubygems (eg: ffi_c.bundle files may be x86_64 with an arm64 interpreter)'

0 commit comments

Comments
 (0)