Skip to content

Commit bb592ef

Browse files
authoredJan 15, 2024
Merge pull request #42229 from facebook/cipolleschi/fix-_jump_fcontex-071
[RN][iOS] Fix symbol not found _jump_fcontext with use_frameworks!
2 parents 568031e + c38cdb6 commit bb592ef

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed
 

‎scripts/cocoapods/utils.rb

+4-3
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def self.apply_xcode_15_patch(installer, xcodebuild_manager: Xcodebuild)
160160

161161
# fix for weak linking
162162
self.safe_init(config, other_ld_flags_key)
163-
if self.is_using_xcode15_or_greter(:xcodebuild_manager => xcodebuild_manager)
163+
if self.is_using_xcode15_0(:xcodebuild_manager => xcodebuild_manager)
164164
self.add_value_to_setting_if_missing(config, other_ld_flags_key, xcode15_compatibility_flags)
165165
else
166166
self.remove_value_from_setting_if_present(config, other_ld_flags_key, xcode15_compatibility_flags)
@@ -299,7 +299,7 @@ def self.remove_value_from_setting_if_present(config, setting_name, value)
299299
end
300300
end
301301

302-
def self.is_using_xcode15_or_greter(xcodebuild_manager: Xcodebuild)
302+
def self.is_using_xcode15_0(xcodebuild_manager: Xcodebuild)
303303
xcodebuild_version = xcodebuild_manager.version
304304

305305
# The output of xcodebuild -version is something like
@@ -310,7 +310,8 @@ def self.is_using_xcode15_or_greter(xcodebuild_manager: Xcodebuild)
310310
regex = /(\d+)\.(\d+)(?:\.(\d+))?/
311311
if match_data = xcodebuild_version.match(regex)
312312
major = match_data[1].to_i
313-
return major >= 15
313+
minor = match_data[2].to_i
314+
return major == 15 && minor == 0
314315
end
315316

316317
return false

0 commit comments

Comments
 (0)
Please sign in to comment.