Skip to content

Commit eaa32f9

Browse files
Romick2005Dmitry Rykun
authored and
Dmitry Rykun
committed
#34610 Fix invalid range "t-5" in string transliteration [iOS] (#34636)
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: #34636 Test Plan: Run pod install on M1 machine. Reviewed By: sammy-SC Differential Revision: D39423276 Pulled By: cipolleschi fbshipit-source-id: 4ec95af7103395792facba0f93fd8de05a3fe78d
1 parent c401334 commit eaa32f9

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

scripts/cocoapods/utils.rb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,12 @@ def self.fix_library_search_path(config)
139139
return
140140
end
141141

142-
# $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME) causes problem with Xcode 12.5 + arm64 (Apple M1)
143-
# since the libraries there are only built for x86_64 and i386.
144-
lib_search_paths.delete("$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)")
145-
lib_search_paths.delete("\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"")
142+
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)\"")
143+
# $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME) causes problem with Xcode 12.5 + arm64 (Apple M1)
144+
# since the libraries there are only built for x86_64 and i386.
145+
lib_search_paths.delete("$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)")
146+
lib_search_paths.delete("\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"")
147+
end
146148

147149
if !(lib_search_paths.include?("$(SDKROOT)/usr/lib/swift") || lib_search_paths.include?("\"$(SDKROOT)/usr/lib/swift\""))
148150
# however, $(SDKROOT)/usr/lib/swift is required, at least if user is not running CocoaPods 1.11

0 commit comments

Comments
 (0)