Merge pull request #12009 from marcuswu0814/master

CocoaPods · Jul 30, 2023 · 53893a2 · 53893a2
2 parents 400f290 + 032ce36
commit 53893a2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,7 +17,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 * Use safe_load during custom YAML config loading.  
   [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
   [#11974](https://github.com/CocoaPods/CocoaPods/pull/11974)
-
+* Xcode 15 fix: Replace `DT_TOOLCHAIN_DIR` with `TOOLCHAIN_DIR` when generating script.
+  [Marcus Wu](https://github.com/marcuswu0814)
+  [#12009](https://github.com/CocoaPods/CocoaPods/pull/12009)
 
 ## 1.12.1 (2023-04-18)
 

diff --git a/lib/cocoapods/generator/embed_frameworks_script.rb b/lib/cocoapods/generator/embed_frameworks_script.rb
@@ -63,7 +63,7 @@ def script
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
 COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
-SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
+SWIFT_STDLIB_PATH="${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
 BCSYMBOLMAP_DIR="BCSymbolMaps"
 
 

diff --git a/lib/cocoapods/target/build_settings.rb b/lib/cocoapods/target/build_settings.rb
@@ -359,7 +359,7 @@ def _ld_runpath_search_paths(requires_host_target: false, test_bundle: false, us
                    else
                      "'@loader_path/Frameworks'"
                    end
-          paths << '${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}' if uses_swift
+          paths << '${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}' if uses_swift
         else
           paths << "'@executable_path/Frameworks'"
           paths << "'@loader_path/Frameworks'"
@@ -866,7 +866,7 @@ def linker_names_from_libraries(libraries)
           search_paths = vendored_static_library_search_paths + vendored_dynamic_library_search_paths
           if target.uses_swift? || other_swift_flags_without_swift?
             search_paths << '/usr/lib/swift'
-            search_paths << '${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}'
+            search_paths << '${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}'
             search_paths << '$(PLATFORM_DIR)/Developer/Library/Frameworks' if test_xcconfig?
           end
           return search_paths if target.build_as_framework? || !target.should_build?

diff --git a/spec/cocoapods-integration-specs b/spec/cocoapods-integration-specs
diff --git a/spec/unit/target/build_settings/aggregate_target_settings_spec.rb b/spec/unit/target/build_settings/aggregate_target_settings_spec.rb
@@ -432,15 +432,15 @@ def pod_target(spec, target_definition)
             mock_user_target = mock('usertarget')
             mock_user_target.stubs(:symbol_type).returns(:unit_test_bundle)
             @target.stubs(:user_targets).returns([mock_user_target])
-            @generator.generate.to_hash['LD_RUNPATH_SEARCH_PATHS'].should == %q[$(inherited) /usr/lib/swift "$(PLATFORM_DIR)/Developer/Library/Frameworks" '@executable_path/../Frameworks' '@loader_path/../Frameworks' "${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"]
+            @generator.generate.to_hash['LD_RUNPATH_SEARCH_PATHS'].should == %q[$(inherited) /usr/lib/swift "$(PLATFORM_DIR)/Developer/Library/Frameworks" '@executable_path/../Frameworks' '@loader_path/../Frameworks' "${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"]
           end
 
           it 'includes correct default runpath search path list for OSX application user target' do
             @target.stubs(:platform).returns(Platform.new(:osx, '10.10'))
             mock_user_target = mock('usertarget')
             mock_user_target.stubs(:symbol_type).returns(:application)
             @target.stubs(:user_targets).returns([mock_user_target])
-            @generator.generate.to_hash['LD_RUNPATH_SEARCH_PATHS'].should == %q[$(inherited) /usr/lib/swift '@executable_path/../Frameworks' '@loader_path/Frameworks' "${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"]
+            @generator.generate.to_hash['LD_RUNPATH_SEARCH_PATHS'].should == %q[$(inherited) /usr/lib/swift '@executable_path/../Frameworks' '@loader_path/Frameworks' "${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"]
           end
 
           it 'uses the target definition swift version' do