From 1ef338fb3bcacae3dfd015029d5f4630a80dba78 Mon Sep 17 00:00:00 2001
From: Chris Parsons <cparsons@google.com>
Date: Mon, 28 Sep 2015 22:48:11 +0000
Subject: Rollback of "Propagates cc_library linkopts attribute to dependent
 objc_libraries.": breaks certain objc_binary build targets.

--
MOS_MIGRATED_REVID=104146276
---
 .../google/devtools/build/lib/rules/objc/CompilationSupport.java  | 1 -
 .../java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java | 8 ++------
 .../com/google/devtools/build/lib/rules/objc/ObjcProvider.java    | 5 -----
 3 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
index adaa108871..e0d9700cff 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
@@ -785,7 +785,6 @@ public final class CompilationSupport {
         .addExecPaths(ccLibraries)
         .addBeforeEach("-force_load", Artifact.toExecPaths(objcProvider.get(FORCE_LOAD_LIBRARY)))
         .add(extraLinkArgs)
-        .add(objcProvider.get(ObjcProvider.LINKOPT))
         .build();
 
     if (ruleContext.getConfiguration().isCodeCoverageEnabled()) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java
index 2c72aae3b6..cd65adb3e0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java
@@ -35,7 +35,6 @@ import static com.google.devtools.build.lib.rules.objc.ObjcProvider.INCLUDE;
 import static com.google.devtools.build.lib.rules.objc.ObjcProvider.INCLUDE_SYSTEM;
 import static com.google.devtools.build.lib.rules.objc.ObjcProvider.LIBRARY;
 import static com.google.devtools.build.lib.rules.objc.ObjcProvider.LINKED_BINARY;
-import static com.google.devtools.build.lib.rules.objc.ObjcProvider.LINKOPT;
 import static com.google.devtools.build.lib.rules.objc.ObjcProvider.MODULE_MAP;
 import static com.google.devtools.build.lib.rules.objc.ObjcProvider.SDK_DYLIB;
 import static com.google.devtools.build.lib.rules.objc.ObjcProvider.SDK_FRAMEWORK;
@@ -62,7 +61,6 @@ import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.packages.BuildType;
 import com.google.devtools.build.lib.rules.cpp.CcCommon;
-import com.google.devtools.build.lib.rules.cpp.CcLinkParams;
 import com.google.devtools.build.lib.rules.cpp.CcLinkParamsProvider;
 import com.google.devtools.build.lib.rules.cpp.CppCompilationContext;
 import com.google.devtools.build.lib.rules.cpp.CppModuleMap;
@@ -475,10 +473,8 @@ public final class ObjcCommon {
         objcProvider.addAll(DEFINE, headerProvider.getDefines());
       }
       for (CcLinkParamsProvider linkProvider : depCcLinkProviders) {
-        CcLinkParams params = linkProvider.getCcLinkParams(true, false);
-        objcProvider
-            .addAll(LINKOPT, params.flattenedLinkopts())
-            .addTransitiveAndPropagate(CC_LIBRARY, params.getLibraries());
+        objcProvider.addTransitiveAndPropagate(
+            CC_LIBRARY, linkProvider.getCcLinkParams(true, false).getLibraries());
       }
 
       if (compilationAttributes.isPresent()) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java
index 85e05dc10f..06c4a51adf 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java
@@ -207,11 +207,6 @@ public final class ObjcProvider implements TransitiveInfoProvider {
    */
   public static final Key<LinkerInputs.LibraryToLink> CC_LIBRARY = new Key<>(LINK_ORDER);
 
-  /**
-   * Linking options from dependencies.
-   */
-  public static final Key<String> LINKOPT = new Key<>(LINK_ORDER);
-
   /**
    * Flags that apply to a transitive build dependency tree. Each item in the enum corresponds to a
    * flag. If the item is included in the key {@link #FLAG}, then the flag is considered set.
-- 
cgit v1.2.3