|
@@ -135,16 +135,17 @@ end
|
|
|
|
|
|
|
|
def fix_library_search_paths(installer)
|
|
def fix_library_search_paths(installer)
|
|
|
def fix_config(config)
|
|
def fix_config(config)
|
|
|
- lib_search_paths = config.build_settings["LIBRARY_SEARCH_PATHS"]
|
|
|
|
|
- if lib_search_paths
|
|
|
|
|
- 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)\"")
|
|
|
|
|
- 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
|
|
|
|
|
- lib_search_paths.insert(0, "$(SDKROOT)/usr/lib/swift")
|
|
|
|
|
|
|
+ lib_search_paths = config.build_settings["LIBRARY_SEARCH_PATHS"]
|
|
|
|
|
+ if lib_search_paths
|
|
|
|
|
+ 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)\"")
|
|
|
|
|
+ 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
|
|
|
|
|
+ lib_search_paths.insert(0, "$(SDKROOT)/usr/lib/swift")
|
|
|
|
|
+ end
|
|
|
end
|
|
end
|
|
|
end
|
|
end
|
|
|
end
|
|
end
|
|
@@ -166,4 +167,3 @@ end
|
|
|
# end
|
|
# end
|
|
|
# project.save()
|
|
# project.save()
|
|
|
# end
|
|
# end
|
|
|
-end
|
|
|
