mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Summary: Fix invalid range "t-5" in string transliteration [iOS] for M1 pod install issue. This should fix pod install error for M1 machines. ## Changelog [iOS] [Fixed] - Fix ios pod install error Pull Request resolved: https://github.com/facebook/react-native/pull/34636 Test Plan: Run pod install on M1 machine. Reviewed By: sammy-SC Differential Revision: D39423276 Pulled By: cipolleschi fbshipit-source-id: 4ec95af7103395792facba0f93fd8de05a3fe78d
This commit is contained in:
committed by
Dmitry Rykun
parent
c401334e04
commit
eaa32f9f65
@@ -139,10 +139,12 @@ class ReactNativePodsUtils
|
||||
return
|
||||
end
|
||||
|
||||
# $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME) causes problem with Xcode 12.5 + arm64 (Apple M1)
|
||||
# since the libraries there are only built for x86_64 and i386.
|
||||
lib_search_paths.delete("$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)")
|
||||
lib_search_paths.delete("\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"")
|
||||
if lib_search_paths.include?("$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)") || lib_search_paths.include?("\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"")
|
||||
# $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME) causes problem with Xcode 12.5 + arm64 (Apple M1)
|
||||
# since the libraries there are only built for x86_64 and i386.
|
||||
lib_search_paths.delete("$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)")
|
||||
lib_search_paths.delete("\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"")
|
||||
end
|
||||
|
||||
if !(lib_search_paths.include?("$(SDKROOT)/usr/lib/swift") || lib_search_paths.include?("\"$(SDKROOT)/usr/lib/swift\""))
|
||||
# however, $(SDKROOT)/usr/lib/swift is required, at least if user is not running CocoaPods 1.11
|
||||
|
||||
Reference in New Issue
Block a user