diff options
author | Googler <noreply@google.com> | 2015-05-08 22:24:30 +0000 |
---|---|---|
committer | Han-Wen Nienhuys <hanwen@google.com> | 2015-05-11 12:48:58 +0000 |
commit | 5c0e4b2c64e9c9ccf80607ce4d8855ad032c302f (patch) | |
tree | 38c24d6ed55bc4124e916b5228d62fe9ba48adf5 | |
parent | f7c992263610c9246a2c81b4e015b9c7f216fd50 (diff) |
RELNOTES: Fix linking order for Bazel-generated XCode projects.
--
MOS_MIGRATED_REVID=93170106
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/XcodeProvider.java | 6 |
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> |