diff options
author | 2017-07-07 21:56:42 +0200 | |
---|---|---|
committer | 2017-07-10 09:16:43 +0200 | |
commit | f67b61aca8be079b26e9fdb9693f4ed3ca752d65 (patch) | |
tree | f3a38ccadc70c79e918c0360351a1b7b998bab13 /src/main/java/com/google/devtools | |
parent | 45b79e51575d93d4c1da93e070b159842a73b56a (diff) |
Remove objc_includes_prioritize_static_libs
This flag was experimental but is now always-on.
RELNOTES: None.
PiperOrigin-RevId: 161234569
Diffstat (limited to 'src/main/java/com/google/devtools')
3 files changed, 2 insertions, 32 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 |