RELNOTES: Fix linking order for Bazel-generated XCode projects.

--
MOS_MIGRATED_REVID=93170106

1 files changed, 4 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/XcodeProvider.java b/src/main/java/com/google/devtools/build/lib/rules/objc/XcodeProvider.java
index 1d07ef79a3..696e1f42f8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/XcodeProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/XcodeProvider.java
@@ -79,10 +79,12 @@ public final class XcodeProvider implements TransitiveInfoProvider {
     private final NestedSetBuilder<String> nonPropagatedHeaderSearchPaths =
         NestedSetBuilder.stableOrder();
     private Optional<InfoplistMerging> infoplistMerging = Optional.absent();
+    // Dependencies must be in link order because XCode observes the dependency ordering for
+    // binary linking.
     private final NestedSetBuilder<XcodeProvider> propagatedDependencies =
-        NestedSetBuilder.stableOrder();
+        NestedSetBuilder.linkOrder();
     private final NestedSetBuilder<XcodeProvider> nonPropagatedDependencies =
-        NestedSetBuilder.stableOrder();
+        NestedSetBuilder.linkOrder();
     private final ImmutableList.Builder<XcodeprojBuildSetting> xcodeprojBuildSettings =
         new ImmutableList.Builder<>();
     private final ImmutableList.Builder<XcodeprojBuildSetting>