Remove changes from rpoject.pbxproj, add -Wl flag

software-mansion · Sep 21, 2023 · 1942fc3 · 1942fc3
1 parent dfa063c
commit 1942fc3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 21 deletions.
diff --git a/Example/ios/Podfile b/Example/ios/Podfile
@@ -62,12 +62,12 @@ target 'ScreensExample' do
     projects = installer.aggregate_targets
         .map{ |t| t.user_project }
         .uniq{ |p| p.path }
-    should_use_classic_linker = File.exists?(File.join(`xcode-select -p`.strip, 'Toolchains/XcodeDefault.xctoolchain/usr/bin/ld-classic'))
+    should_use_classic_linker = File.exist?(File.join(`xcode-select -p`.strip, 'Toolchains/XcodeDefault.xctoolchain/usr/bin/ld-classic'))
     projects.each do |project|
       if should_use_classic_linker
-        Pod::UI.puts("Applying -ld_classic for Xcode 15 on #{ project.path }")
+        Pod::UI.puts("Applying flags '-Wl -ld_classic' for Xcode 15 on #{ project.path }")
         project.build_configurations.each do |config|
-          config.build_settings['OTHER_LDFLAGS'] = '$(inherited) -ld_classic'
+          config.build_settings['OTHER_LDFLAGS'] = '$(inherited) -Wl -ld_classic'
         end
         project.save()
       end

diff --git a/Example/ios/ScreensExample.xcodeproj/project.pbxproj b/Example/ios/ScreensExample.xcodeproj/project.pbxproj
@@ -941,10 +941,6 @@
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-ld_classic",
-				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
@@ -1001,10 +997,6 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-ld_classic",
-				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;

diff --git a/FabricExample/ios/Podfile b/FabricExample/ios/Podfile
@@ -61,16 +61,15 @@ target 'FabricExample' do
     )
     __apply_Xcode_12_5_M1_post_install_workaround(installer)
 
-
     projects = installer.aggregate_targets
         .map{ |t| t.user_project }
         .uniq{ |p| p.path }
-    should_use_classic_linker = File.exists?(File.join(`xcode-select -p`.strip, 'Toolchains/XcodeDefault.xctoolchain/usr/bin/ld-classic'))
+    should_use_classic_linker = File.exist?(File.join(`xcode-select -p`.strip, 'Toolchains/XcodeDefault.xctoolchain/usr/bin/ld-classic'))
     projects.each do |project|
       if should_use_classic_linker
-        Pod::UI.puts("Applying -ld_classic for Xcode 15 on #{ project.path }")
+        Pod::UI.puts("Applying flags '-Wl -ld_classic' for Xcode 15 on #{ project.path }")
         project.build_configurations.each do |config|
-          config.build_settings['OTHER_LDFLAGS'] = '$(inherited) -ld_classic'
+          config.build_settings['OTHER_LDFLAGS'] = '$(inherited) -Wl -ld_classic'
         end
         project.save()
       end

diff --git a/FabricTestExample/ios/Podfile b/FabricTestExample/ios/Podfile
@@ -64,12 +64,12 @@ target 'FabricTestExample' do
     projects = installer.aggregate_targets
         .map{ |t| t.user_project }
         .uniq{ |p| p.path }
-    should_use_classic_linker = File.exists?(File.join(`xcode-select -p`.strip, 'Toolchains/XcodeDefault.xctoolchain/usr/bin/ld-classic'))
+    should_use_classic_linker = File.exist?(File.join(`xcode-select -p`.strip, 'Toolchains/XcodeDefault.xctoolchain/usr/bin/ld-classic'))
     projects.each do |project|
       if should_use_classic_linker
-        Pod::UI.puts("Applying -ld_classic for Xcode 15 on #{ project.path }")
+        Pod::UI.puts("Applying flags '-Wl -ld_classic' for Xcode 15 on #{ project.path }")
         project.build_configurations.each do |config|
-          config.build_settings['OTHER_LDFLAGS'] = '$(inherited) -ld_classic'
+          config.build_settings['OTHER_LDFLAGS'] = '$(inherited) -Wl -ld_classic'
         end
         project.save()
       end

diff --git a/TestsExample/ios/Podfile b/TestsExample/ios/Podfile
@@ -62,12 +62,12 @@ target 'TestsExample' do
     projects = installer.aggregate_targets
         .map{ |t| t.user_project }
         .uniq{ |p| p.path }
-    should_use_classic_linker = File.exists?(File.join(`xcode-select -p`.strip, 'Toolchains/XcodeDefault.xctoolchain/usr/bin/ld-classic'))
+    should_use_classic_linker = File.exist?(File.join(`xcode-select -p`.strip, 'Toolchains/XcodeDefault.xctoolchain/usr/bin/ld-classic'))
     projects.each do |project|
       if should_use_classic_linker
-        Pod::UI.puts("Applying -ld_classic for Xcode 15 on #{ project.path }")
+        Pod::UI.puts("Applying flags '-Wl -ld_classic' for Xcode 15 on #{ project.path }")
         project.build_configurations.each do |config|
-          config.build_settings['OTHER_LDFLAGS'] = '$(inherited) -ld_classic'
+          config.build_settings['OTHER_LDFLAGS'] = '$(inherited) -Wl -ld_classic'
         end
         project.save()
       end