Skip to content

Commit 8f41f25

Browse files
committed
Revert "Fix pod install for swift libs using new arch (#38121)"
This reverts commit 7a4ae79.
1 parent b95c87d commit 8f41f25

File tree

6 files changed

+8
-13
lines changed

6 files changed

+8
-13
lines changed

packages/react-native/ReactCommon/React-Fabric.podspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ Pod::Spec.new do |s|
3333
s.source = source
3434
s.source_files = "dummyFile.cpp"
3535
s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES",
36-
"CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
37-
"DEFINES_MODULE" => "YES" }
36+
"CLANG_CXX_LANGUAGE_STANDARD" => "c++17" }
3837

3938
if ENV['USE_FRAMEWORKS']
4039
s.header_mappings_dir = File.absolute_path('./')

packages/react-native/ReactCommon/jsi/React-jsi.podspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ Pod::Spec.new do |s|
3636

3737
s.header_dir = "jsi"
3838
s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags
39-
s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\"",
40-
"DEFINES_MODULE" => "YES" }
39+
s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\"" }
4140

4241
s.dependency "boost", "1.76.0"
4342
s.dependency "DoubleConversion"

packages/react-native/ReactCommon/react/debug/React-debug.podspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ Pod::Spec.new do |s|
2727
s.source = source
2828
s.source_files = "**/*.{cpp,h}"
2929
s.header_dir = "react/debug"
30-
s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
31-
"DEFINES_MODULE" => "YES" }
30+
s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" }
3231

3332
if ENV['USE_FRAMEWORKS']
3433
s.module_name = "React_debug"

packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ Pod::Spec.new do |s|
4949
header_search_paths = header_search_paths + ["\"$(PODS_TARGET_SRCROOT)/platform/ios\""]
5050
end
5151

52-
s.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
53-
"HEADER_SEARCH_PATHS" => header_search_paths.join(" "),
54-
"DEFINES_MODULE" => "YES" }
52+
s.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", "HEADER_SEARCH_PATHS" => header_search_paths.join(" ") }
5553

5654
s.dependency "glog"
5755
s.dependency "RCT-Folly/Fabric", folly_version

packages/react-native/ReactCommon/react/utils/React-utils.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ Pod::Spec.new do |s|
4242
s.compiler_flags = folly_compiler_flags
4343
s.header_dir = "react/utils"
4444
s.exclude_files = "tests"
45-
s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
46-
"HEADER_SEARCH_PATHS" => header_search_paths.join(' '),
47-
"DEFINES_MODULE" => "YES" }
45+
s.pod_target_xcconfig = {
46+
"CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
47+
"HEADER_SEARCH_PATHS" => header_search_paths.join(' ')}
4848

4949
if ENV['USE_FRAMEWORKS']
5050
s.module_name = "React_utils"

packages/react-native/scripts/react_native_pods.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def use_react_native! (
139139
pod 'Yoga', :path => "#{prefix}/ReactCommon/yoga", :modular_headers => true
140140

141141
pod 'DoubleConversion', :podspec => "#{prefix}/third-party-podspecs/DoubleConversion.podspec"
142-
pod 'glog', :podspec => "#{prefix}/third-party-podspecs/glog.podspec", :modular_headers => true
142+
pod 'glog', :podspec => "#{prefix}/third-party-podspecs/glog.podspec"
143143
pod 'boost', :podspec => "#{prefix}/third-party-podspecs/boost.podspec"
144144
pod 'RCT-Folly', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec", :modular_headers => true
145145

0 commit comments

Comments
 (0)