diff options
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java | 16 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java | 4 |
2 files changed, 4 insertions, 16 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java index e5cee301a4..3d99d68bae 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java @@ -175,7 +175,6 @@ public final class CppConfiguration extends BuildConfiguration.Fragment { private final FlagList unfilteredCompilerFlags; private final ImmutableList<String> cOptions; - private final FlagList fullyStaticLinkFlags; private final FlagList mostlyStaticLinkFlags; private final FlagList mostlyStaticSharedLinkFlags; private final FlagList dynamicLinkFlags; @@ -259,10 +258,6 @@ public final class CppConfiguration extends BuildConfiguration.Fragment { ImmutableList.copyOf(cppOptions.conlyoptList), new FlagList( cppToolchainInfo.configureAllLegacyLinkOptions( - compilationMode, cppOptions.getLipoMode(), LinkingMode.FULLY_STATIC), - ImmutableList.of()), - new FlagList( - cppToolchainInfo.configureAllLegacyLinkOptions( compilationMode, cppOptions.getLipoMode(), LinkingMode.MOSTLY_STATIC), ImmutableList.of()), new FlagList( @@ -307,7 +302,6 @@ public final class CppConfiguration extends BuildConfiguration.Fragment { FlagList cxxFlags, FlagList unfilteredCompilerFlags, ImmutableList<String> cOptions, - FlagList fullyStaticLinkFlags, FlagList mostlyStaticLinkFlags, FlagList mostlyStaticSharedLinkFlags, FlagList dynamicLinkFlags, @@ -339,7 +333,6 @@ public final class CppConfiguration extends BuildConfiguration.Fragment { this.cxxFlags = cxxFlags; this.unfilteredCompilerFlags = unfilteredCompilerFlags; this.cOptions = cOptions; - this.fullyStaticLinkFlags = fullyStaticLinkFlags; this.mostlyStaticLinkFlags = mostlyStaticLinkFlags; this.mostlyStaticSharedLinkFlags = mostlyStaticSharedLinkFlags; this.dynamicLinkFlags = dynamicLinkFlags; @@ -713,12 +706,9 @@ public final class CppConfiguration extends BuildConfiguration.Fragment { ) @Deprecated public ImmutableList<String> getFullyStaticLinkOptions( - Iterable<String> featuresNotUsedAnymore, Boolean sharedLib) { - if (sharedLib) { - return getSharedLibraryLinkOptions(mostlyStaticLinkFlags); - } else { - return fullyStaticLinkFlags.evaluate(); - } + Iterable<String> featuresNotUsedAnymore, boolean sharedLib) { + Preconditions.checkArgument(sharedLib); + return getSharedLibraryLinkOptions(mostlyStaticLinkFlags); } /** diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java index 9025818edc..56ec3556ff 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java @@ -254,9 +254,7 @@ public class CppHelper { * @param sharedLib true if the output is a shared lib, false if it's an executable */ public static ImmutableList<String> getFullyStaticLinkOptions( - CppConfiguration config, - CcToolchainProvider toolchain, - Boolean sharedLib) { + CppConfiguration config, CcToolchainProvider toolchain, boolean sharedLib) { if (sharedLib) { return toolchain.getSharedLibraryLinkOptions( toolchain.getLegacyMostlyStaticLinkFlags( |