diff options
6 files changed, 2 insertions, 58 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/LegacyCompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/LegacyCompilationSupport.java index 9a8abaff11..7a703fe818 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/LegacyCompilationSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/LegacyCompilationSupport.java @@ -695,9 +695,7 @@ public class LegacyCompilationSupport extends CompilationSupport { registerObjFilelistAction(objFiles, inputFileList); - if (objcConfiguration.shouldPrioritizeStaticLibs()) { - commandLine.add("-filelist").add(inputFileList.getExecPathString()); - } + commandLine.add("-filelist").add(inputFileList.getExecPathString()); AppleBitcodeMode bitcodeMode = appleConfiguration.getBitcodeMode(); commandLine.add(bitcodeMode.getCompileAndLinkFlags()); @@ -728,13 +726,7 @@ public class LegacyCompilationSupport extends CompilationSupport { .add(DEFAULT_LINKER_FLAGS) .addBeforeEach("-framework", frameworkNames(objcProvider)) .addBeforeEach("-weak_framework", SdkFramework.names(objcProvider.get(WEAK_SDK_FRAMEWORK))) - .addFormatEach("-l%s", libraryNames); - - if (!objcConfiguration.shouldPrioritizeStaticLibs()) { - commandLine.add("-filelist").add(inputFileList.getExecPathString()); - } - - commandLine + .addFormatEach("-l%s", libraryNames) .addExecPath("-o", linkedBinary) .addBeforeEachExecPath("-force_load", forceLinkArtifacts) .add(extraLinkArgs) diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java index de18d2c2c0..e4401fc3bd 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java @@ -206,18 +206,6 @@ public class ObjcCommandLineOptions extends FragmentOptions { public String iosSigningCertName; @Option( - name = "objc_includes_prioritize_static_libs", - defaultValue = "true", - category = "flags", - documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, - effectTags = {OptionEffectTag.UNKNOWN}, - help = - "If set, the linker invocation will contain static library includes before frameworks" - + " and system libraries." - ) - public boolean prioritizeStaticLibs; - - @Option( name = "objc_debug_with_GLIBCXX", defaultValue = "true", optionUsageRestrictions = OptionUsageRestrictions.UNDOCUMENTED, diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java index d3434ae5b7..75bc575994 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java @@ -68,7 +68,6 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment { private final boolean enableBinaryStripping; private final boolean moduleMapsEnabled; @Nullable private final String signingCertName; - private final boolean prioritizeStaticLibs; private final boolean debugWithGlibcxx; @Nullable private final Label extraEntitlements; private final boolean deviceDebugEntitlements; @@ -104,7 +103,6 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment { this.enableBinaryStripping = objcOptions.enableBinaryStripping; this.moduleMapsEnabled = objcOptions.enableModuleMaps; this.signingCertName = objcOptions.iosSigningCertName; - this.prioritizeStaticLibs = objcOptions.prioritizeStaticLibs; this.debugWithGlibcxx = objcOptions.debugWithGlibcxx; this.extraEntitlements = objcOptions.extraEntitlements; this.deviceDebugEntitlements = objcOptions.deviceDebugEntitlements; @@ -276,14 +274,6 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment { } /** - * Returns true if the linker invocation should contain static library includes before framework - * and system library includes. - */ - public boolean shouldPrioritizeStaticLibs() { - return this.prioritizeStaticLibs; - } - - /** * Returns the extra entitlements plist specified as a flag or {@code null} if none was given. */ @Nullable diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/IosTestTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/IosTestTest.java index 1c93df5bc1..4e7dc479cb 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/IosTestTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/IosTestTest.java @@ -646,11 +646,6 @@ public class IosTestTest extends ObjcRuleTestCase { } @Test - public void testLinkIncludeOrder_frameworksAndSystemLibsFirst() throws Exception { - checkLinkIncludeOrderFrameworksAndSystemLibsFirst(RULE_TYPE); - } - - @Test public void testMergesActoolPartialInfoplist() throws Exception { checkMergesPartialInfoplists(RULE_TYPE); } diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryTest.java index c167d312b5..563dd887b4 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryTest.java @@ -555,11 +555,6 @@ public class ObjcBinaryTest extends ObjcRuleTestCase { } @Test - public void testLinkIncludeOrder_frameworksAndSystemLibsFirst() throws Exception { - checkLinkIncludeOrderFrameworksAndSystemLibsFirst(RULE_TYPE); - } - - @Test public void testLinksDylibsTransitively() throws Exception { checkLinksDylibsTransitively(RULE_TYPE); } diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java index 75e3d9c07e..5ec6bc0c82 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java @@ -1052,22 +1052,6 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase { getSourceArtifact("fx/fx2.framework/d")); } - protected void checkLinkIncludeOrderFrameworksAndSystemLibsFirst(RuleType ruleType) - throws Exception { - useConfiguration("--noobjc_includes_prioritize_static_libs"); - scratch.file("fx/fx1.framework"); - scratch.file("fx/BUILD", "objc_framework(name = 'fx')"); - scratch.file("x/a.m"); - ruleType.scratchTarget( - scratch, "srcs", "['a.m']", "sdk_frameworks", "['fx']", "sdk_dylibs", "['libdy1']"); - - CommandAction linkAction = linkAction("//x:x"); - String linkActionArgs = Joiner.on(" ").join(linkAction.getArguments()); - - assertThat(linkActionArgs.indexOf("-F")).isLessThan(linkActionArgs.indexOf("-filelist")); - assertThat(linkActionArgs.indexOf("-l")).isLessThan(linkActionArgs.indexOf("-filelist")); - } - protected void checkLinkIncludeOrderStaticLibsFirst(RuleType ruleType) throws Exception { scratch.file("fx/fx1.framework"); scratch.file("fx/BUILD", "objc_framework(name = 'fx')"); |