Skip to content

Propagate RCT_REMOVE_LEGACY_ARCH to SWIFT_ACTIVE_COMPILATION_CONDITIONS #56974

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

Open
christophpurrer wants to merge 1 commit into
base: main
Choose a base branch
from
+53 −0
Open

Propagate RCT_REMOVE_LEGACY_ARCH to SWIFT_ACTIVE_COMPILATION_CONDITIONS #56974

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
51 changes: 51 additions & 0 deletions packages/react-native/scripts/cocoapods/utils.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,57 @@ def self.remove_compiler_flag_from_project(installer, flag, configuration: nil)
end
end

def self.add_swift_active_compilation_condition_to_project(installer, condition)
projects = self.extract_projects(installer)

projects.each do |project|
project.build_configurations.each do |config|
self.add_swift_condition_in_config(config, condition)
end
project.save()
end
end

def self.remove_swift_active_compilation_condition_from_project(installer, condition)
projects = self.extract_projects(installer)

projects.each do |project|
project.build_configurations.each do |config|
self.remove_swift_condition_in_config(config, condition)
end
project.save()
end
end

def self.add_swift_condition_in_config(config, condition)
key = "SWIFT_ACTIVE_COMPILATION_CONDITIONS"
current = config.build_settings[key]

# Normalise to array form so we can dedupe and preserve $(inherited)
# alongside any pre-existing conditions (e.g. DEBUG).
list = case current
when nil then ["$(inherited)"]
when Array then current.dup
when String then current.split(/\s+/).reject(&:empty?)
end

list << "$(inherited)" unless list.include?("$(inherited)")
list << condition unless list.include?(condition)

config.build_settings[key] = list
end

def self.remove_swift_condition_in_config(config, condition)
key = "SWIFT_ACTIVE_COMPILATION_CONDITIONS"
current = config.build_settings[key]
return if current.nil?

list = current.kind_of?(Array) ? current.dup : current.split(/\s+/).reject(&:empty?)
list.delete(condition)

config.build_settings[key] = list
end

def self.add_compiler_flag_to_pods(installer, flag, configuration: nil)
installer.target_installation_results.pod_target_installation_results.each do |pod_name, target_installation_result|
target_installation_result.native_target.build_configurations.each do |config|
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/scripts/react_native_pods.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,8 +556,10 @@ def react_native_post_install(

if (ENV['RCT_REMOVE_LEGACY_ARCH'] == '1')
ReactNativePodsUtils.add_compiler_flag_to_project(installer, "-DRCT_REMOVE_LEGACY_ARCH=1")
ReactNativePodsUtils.add_swift_active_compilation_condition_to_project(installer, "RCT_REMOVE_LEGACY_ARCH")
else
ReactNativePodsUtils.remove_compiler_flag_from_project(installer, "-DRCT_REMOVE_LEGACY_ARCH=1")
ReactNativePodsUtils.remove_swift_active_compilation_condition_from_project(installer, "RCT_REMOVE_LEGACY_ARCH")
end

ReactNativePodsUtils.set_ccache_compiler_and_linker_build_settings(installer, react_native_path, ccache_enabled)
Expand Down
Loading