Skip to content

Commit 0ab8b40

Browse files
Saadnajmifacebook-github-bot
authored andcommitted
Remove Xcode 12.5 post install workaround (#39482)
Summary: Now that we updated folly in 17154a6, we should pick up facebook/folly@4a8837f and probably don't need this post install phase anymore ## Changelog: [IOS] [REMOVED] - Remove Xcode 12.5 post install workaround Pull Request resolved: #39482 Test Plan: CI should pass Reviewed By: cipolleschi Differential Revision: D49328614 Pulled By: NickGerleman fbshipit-source-id: 05fa0b6d41d07ac552e2b536fbf3a732a31ba713
1 parent 4418229 commit 0ab8b40

File tree

3 files changed

+0
-22
lines changed

3 files changed

+0
-22
lines changed

packages/react-native/scripts/react_native_pods.rb

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -379,23 +379,3 @@ def use_react_native_codegen!(spec, options={})
379379
:show_env_vars_in_log => true
380380
}
381381
end
382-
383-
# This provides a post_install workaround for build issues related Xcode 12.5 and Apple Silicon machines.
384-
# Call this in the app's main Podfile's post_install hook.
385-
# See https://github.com/facebook/react-native/issues/31480#issuecomment-902912841 for more context.
386-
# Actual fix was authored by https://github.com/mikehardy.
387-
# New app template will call this for now until the underlying issue is resolved.
388-
def __apply_Xcode_12_5_M1_post_install_workaround(installer)
389-
# NOTE: This fix is still required due to RCT-Folly
390-
# creating a function with a better name but keeping the
391-
# previous for backward compatibility
392-
__fix_double_definition_of_clockid_in_folly()
393-
end
394-
395-
def __fix_double_definition_of_clockid_in_folly()
396-
# "Time.h:52:17: error: typedef redefinition with different types"
397-
# We need to make a patch to RCT-Folly - remove the `__IPHONE_OS_VERSION_MIN_REQUIRED` check.
398-
# See https://github.com/facebook/flipper/issues/834 for more details.
399-
time_header = "#{Pod::Config.instance.installation_root.to_s}/Pods/RCT-Folly/folly/portability/Time.h"
400-
`sed -i -e $'s/ && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_10_0)//' '#{time_header}'`
401-
end

packages/react-native/template/ios/Podfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,5 @@ target 'HelloWorld' do
5151
config[:reactNativePath],
5252
:mac_catalyst_enabled => false
5353
)
54-
__fix_double_definition_of_clockid_in_folly()
5554
end
5655
end

packages/rn-tester/Podfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,5 +87,4 @@ end
8787

8888
post_install do |installer|
8989
react_native_post_install(installer, @prefix_path, :mac_catalyst_enabled => false)
90-
__fix_double_definition_of_clockid_in_folly()
9190
end

0 commit comments

Comments
 (0)