Skip to content

Fix Glog for earlier versions of Xcode #41058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+14 −1
Closed

Fix Glog for earlier versions of Xcode #41058

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion packages/react-native/third-party-podspecs/glog.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,23 @@ Pod::Spec.new do |spec|
'src/base/*.h'
spec.exclude_files = "src/windows/**/*"
spec.compiler_flags = '-Wno-shorten-64-to-32'

# TODO: T167482718 Remove this code after April 2024, when Apple will
# push the lower version of Xcode required to upload apps to the Store.
xcode_path = `xcodebuild -version` # This return the current version of Xcode
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Should this be renamed output or something?


match = xcode_path.match(/Xcode (\d+)\.(\d+)/)
major_version = match[1].to_i
minor_version = match[2].to_i
is_greater_than_15 = major_version >= 15
is_greater_than_14_3 = major_version == 14 && minor_version >= 3
should_define_modules = is_greater_than_15 ? "YES" : is_greater_than_14_3 ? "YES" : "NO"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit:

Suggested change
should_define_modules = is_greater_than_15 ? "YES" : is_greater_than_14_3 ? "YES" : "NO"
should_define_modules = is_greater_than_15 || is_greater_than_14_3 ? "YES" : "NO"

# End TODO.

spec.pod_target_xcconfig = {
"USE_HEADERMAP" => "NO",
"HEADER_SEARCH_PATHS" => "$(PODS_TARGET_SRCROOT)/src",
"DEFINES_MODULE" => "YES"
"DEFINES_MODULE" => should_define_modules # When the workaround is removed, set this var to "YES"
}

# Pinning to the same version as React.podspec.
Expand Down