Skip to content
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

Jump to bottom

Fix static linking on iOS #6614

Merged
merged 1 commit into from
Oct 18, 2024
Merged

Fix static linking on iOS #6614

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion apps/fabric-example/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2229,7 +2229,7 @@ SPEC CHECKSUMS:
RNCPicker: d051e0647af8b2ad01a3d39a6b5dd9b7c0ccc166
RNFlashList: 6f169ad83e52579b7754cbbcec1b004c27d82c93
RNGestureHandler: c374c750a0a9bacd95f5c740d146ab9428549d6b
RNReanimated: 4bd6835e4e29f34fd220d14f09be8c1dcb1b9772
RNReanimated: 2db902281618797873d75426f334ede4e503baf8
RNScreens: de6e57426ba0e6cbc3fb5b4f496e7f08cb2773c2
RNSVG: 08750404f92a36162a92522cc77dee437be1d257
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
Expand Down
12 changes: 11 additions & 1 deletion packages/react-native-reanimated/RNReanimated.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,17 @@ Pod::Spec.new do |s|
}
s.compiler_flags = "#{folly_compiler_flags} #{boost_compiler_flags}"
s.xcconfig = {
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Public/React-hermes\" \"$(PODS_ROOT)/Headers/Public/hermes-engine\" \"$(PODS_ROOT)/#{$config[:react_native_common_dir]}\"",
"HEADER_SEARCH_PATHS" => [
'"$(PODS_ROOT)/boost"',
'"$(PODS_ROOT)/boost-for-react-native"',
'"$(PODS_ROOT)/glog"',
'"$(PODS_ROOT)/RCT-Folly"',
'"$(PODS_ROOT)/Headers/Public/React-hermes"',
'"$(PODS_ROOT)/Headers/Public/hermes-engine"',
"\"$(PODS_ROOT)/#{$config[:react_native_common_dir]}\"",
"\"$(PODS_ROOT)/#{$config[:react_native_reanimated_dir_from_pods_root]}/apple\"",
"\"$(PODS_ROOT)/#{$config[:react_native_reanimated_dir_from_pods_root]}/Common/cpp\"",
].join(' '),
"OTHER_CFLAGS" => "$(inherited) #{folly_flags} #{fabric_flags} #{example_flag} #{version_flag} #{debug_flag} #{compilation_metadata_generation_flag}"
}
s.requires_arc = true
Expand Down
5 changes: 5 additions & 0 deletions packages/react-native-reanimated/scripts/reanimated_utils.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ def find_config()
:react_native_node_modules_dir => nil,
:reanimated_node_modules_dir => nil,
:react_native_common_dir => nil,
:react_native_reanimated_dir_from_pods_root => nil,
}

react_native_node_modules_dir = File.join(File.dirname(`cd "#{Pod::Config.instance.installation_root.to_s}" && node --print "require.resolve('react-native/package.json')"`), '..')
Expand Down Expand Up @@ -45,6 +46,10 @@ def find_config()
react_native_common_dir_relative = Pathname.new(react_native_common_dir_absolute).relative_path_from(pods_root).to_s
result[:react_native_common_dir] = react_native_common_dir_relative

react_native_reanimated_dir_absolute = File.join(__dir__, '..')
react_native_reanimated_dir_relative = Pathname.new(react_native_reanimated_dir_absolute).relative_path_from(pods_root).to_s
result[:react_native_reanimated_dir_from_pods_root] = react_native_reanimated_dir_relative

return result
end

Expand Down
Loading