From c5b87aba7c6fd9f73aa55a7b57ed018967695ffe Mon Sep 17 00:00:00 2001 From: zhongwuzw Date: Fri, 12 Jul 2024 02:52:22 -0700 Subject: [PATCH] Don't set empty string when remove ccache (#45400) Summary: After `pod install`, it would set some empty flags, which seems useless. cc cipolleschi . ![image](https://github.com/user-attachments/assets/fb795c61-0838-4522-a34b-cde469467b3b) ## Changelog: [IOS] [FIXED] - Don't set empty string when remove ccache Pull Request resolved: https://github.com/facebook/react-native/pull/45400 Test Plan: No empty flags should be set after we exec `pod install`. Reviewed By: cortinico Differential Revision: D59671357 Pulled By: cipolleschi fbshipit-source-id: 26b55da9efaeed36876649cc27f09ecafaba412a --- packages/react-native/scripts/cocoapods/utils.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/react-native/scripts/cocoapods/utils.rb b/packages/react-native/scripts/cocoapods/utils.rb index 6b54479738f..7db8dacfd3b 100644 --- a/packages/react-native/scripts/cocoapods/utils.rb +++ b/packages/react-native/scripts/cocoapods/utils.rb @@ -116,10 +116,10 @@ class ReactNativePodsUtils projects.each do |project| project.build_configurations.each do |config| # Using the un-qualified names means you can swap in different implementations, for example ccache - config.build_settings["CC"] = config.build_settings["CC"] ? config.build_settings["CC"].gsub(/#{Regexp.escape(ccache_clang_sh)}/, '') : "" - config.build_settings["LD"] = config.build_settings["LD"] ? config.build_settings["LD"].gsub(/#{Regexp.escape(ccache_clang_sh)}/, "") : "" - config.build_settings["CXX"] = config.build_settings["CXX"] ? config.build_settings["CXX"].gsub(/#{Regexp.escape(ccache_clangpp_sh)}/, "") : "" - config.build_settings["LDPLUSPLUS"] = config.build_settings["LDPLUSPLUS"] ? config.build_settings["LDPLUSPLUS"].gsub(/#{Regexp.escape(ccache_clangpp_sh)}/, "") : "" + config.build_settings["CC"] = config.build_settings["CC"].gsub(/#{Regexp.escape(ccache_clang_sh)}/, '') if config.build_settings["CC"] + config.build_settings["LD"] = config.build_settings["LD"].gsub(/#{Regexp.escape(ccache_clang_sh)}/, "") if config.build_settings["LD"] + config.build_settings["CXX"] = config.build_settings["CXX"].gsub(/#{Regexp.escape(ccache_clangpp_sh)}/, "") if config.build_settings["CXX"] + config.build_settings["LDPLUSPLUS"] = config.build_settings["LDPLUSPLUS"].gsub(/#{Regexp.escape(ccache_clangpp_sh)}/, "") if config.build_settings["LDPLUSPLUS"] end project.save()