diff options
author | 2018-01-24 04:49:26 -0800 | |
---|---|---|
committer | 2018-01-24 04:51:37 -0800 | |
commit | efb093638803fb8552be69081873dc30b1cca6d3 (patch) | |
tree | e49bee12d583797527b7d5098a3616a5dd072f45 /src | |
parent | f2234a23826d46b6361b0b7986cad798795e6d9b (diff) |
Remove an unused argument.
RELNOTES: None.
PiperOrigin-RevId: 183069509
Diffstat (limited to 'src')
4 files changed, 19 insertions, 45 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java index 7ad4afdac5..2777c52b84 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java @@ -715,7 +715,7 @@ public final class CcToolchainProvider extends ToolchainInfo { FlagList getFullyStaticLinkFlags(CompilationMode compilationMode, LipoMode lipoMode) { return new FlagList( configureLinkerOptions( - compilationMode, lipoMode, LinkingMode.FULLY_STATIC, toolchainInfo.getLdExecutable()), + compilationMode, lipoMode, LinkingMode.FULLY_STATIC), FlagList.convertOptionalOptions(toolchainInfo.getOptionalLinkerFlags()), ImmutableList.<String>of()); } @@ -724,7 +724,7 @@ public final class CcToolchainProvider extends ToolchainInfo { FlagList getMostlyStaticLinkFlags(CompilationMode compilationMode, LipoMode lipoMode) { return new FlagList( configureLinkerOptions( - compilationMode, lipoMode, LinkingMode.MOSTLY_STATIC, toolchainInfo.getLdExecutable()), + compilationMode, lipoMode, LinkingMode.MOSTLY_STATIC), FlagList.convertOptionalOptions(toolchainInfo.getOptionalLinkerFlags()), ImmutableList.<String>of()); } @@ -735,8 +735,7 @@ public final class CcToolchainProvider extends ToolchainInfo { configureLinkerOptions( compilationMode, lipoMode, - LinkingMode.MOSTLY_STATIC_LIBRARIES, - toolchainInfo.getLdExecutable()), + LinkingMode.MOSTLY_STATIC_LIBRARIES), FlagList.convertOptionalOptions(toolchainInfo.getOptionalLinkerFlags()), ImmutableList.<String>of()); } @@ -745,7 +744,7 @@ public final class CcToolchainProvider extends ToolchainInfo { FlagList getDynamicLinkFlags(CompilationMode compilationMode, LipoMode lipoMode) { return new FlagList( configureLinkerOptions( - compilationMode, lipoMode, LinkingMode.DYNAMIC, toolchainInfo.getLdExecutable()), + compilationMode, lipoMode, LinkingMode.DYNAMIC), FlagList.convertOptionalOptions(toolchainInfo.getOptionalLinkerFlags()), ImmutableList.<String>of()); } @@ -753,10 +752,9 @@ public final class CcToolchainProvider extends ToolchainInfo { ImmutableList<String> configureLinkerOptions( CompilationMode compilationMode, LipoMode lipoMode, - LinkingMode linkingMode, - PathFragment ldExecutable) { + LinkingMode linkingMode) { return toolchainInfo.configureLinkerOptions( - compilationMode, lipoMode, linkingMode, ldExecutable); + compilationMode, lipoMode, linkingMode); } /** Returns the GNU System Name */ 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 53c5988958..bc2959f7b8 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 @@ -296,32 +296,28 @@ public final class CppConfiguration extends BuildConfiguration.Fragment { cppToolchainInfo.configureLinkerOptions( compilationMode, cppOptions.getLipoMode(), - LinkingMode.FULLY_STATIC, - cppToolchainInfo.getLdExecutable()), + LinkingMode.FULLY_STATIC), FlagList.convertOptionalOptions(toolchain.getOptionalLinkerFlagList()), ImmutableList.<String>of()), new FlagList( cppToolchainInfo.configureLinkerOptions( compilationMode, cppOptions.getLipoMode(), - LinkingMode.MOSTLY_STATIC, - cppToolchainInfo.getLdExecutable()), + LinkingMode.MOSTLY_STATIC), FlagList.convertOptionalOptions(toolchain.getOptionalLinkerFlagList()), ImmutableList.<String>of()), new FlagList( cppToolchainInfo.configureLinkerOptions( compilationMode, cppOptions.getLipoMode(), - LinkingMode.MOSTLY_STATIC_LIBRARIES, - cppToolchainInfo.getLdExecutable()), + LinkingMode.MOSTLY_STATIC_LIBRARIES), FlagList.convertOptionalOptions(toolchain.getOptionalLinkerFlagList()), ImmutableList.<String>of()), new FlagList( cppToolchainInfo.configureLinkerOptions( compilationMode, cppOptions.getLipoMode(), - LinkingMode.DYNAMIC, - cppToolchainInfo.getLdExecutable()), + LinkingMode.DYNAMIC), FlagList.convertOptionalOptions(toolchain.getOptionalLinkerFlagList()), ImmutableList.<String>of()), ImmutableList.copyOf(cppOptions.coptList), diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java index 5b87c548e1..6e0c657715 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java @@ -68,7 +68,6 @@ public final class CppToolchainInfo { private final ImmutableMap<String, PathFragment> toolPaths; private final String compiler; - private final PathFragment ldExecutable; private final String abiGlibcVersion; private final String targetCpu; @@ -172,7 +171,6 @@ public final class CppToolchainInfo { toolchain.getToolchainIdentifier(), toolPaths, toolchain.getCompiler(), - getToolPathFragment(toolPaths, CppConfiguration.Tool.LD), toolchain.getAbiLibcVersion(), toolchain.getTargetCpu(), toolchain.getCcTargetOs(), @@ -239,7 +237,6 @@ public final class CppToolchainInfo { String toolchainIdentifier, ImmutableMap<String, PathFragment> toolPaths, String compiler, - PathFragment ldExecutable, String abiGlibcVersion, String targetCpu, String targetOS, @@ -285,7 +282,6 @@ public final class CppToolchainInfo { this.toolchainFeatures = new CcToolchainFeatures(toolchain); this.toolPaths = toolPaths; this.compiler = compiler; - this.ldExecutable = ldExecutable; this.abiGlibcVersion = abiGlibcVersion; this.targetCpu = targetCpu; this.targetOS = targetOS; @@ -451,8 +447,7 @@ public final class CppToolchainInfo { ImmutableList<String> configureLinkerOptions( CompilationMode compilationMode, LipoMode lipoMode, - LinkingMode linkingMode, - PathFragment ldExecutable) { + LinkingMode linkingMode) { List<String> result = new ArrayList<>(); result.addAll(commonLinkOptions); @@ -519,9 +514,6 @@ public final class CppToolchainInfo { /** * Returns the path fragment that is either absolute or relative to the execution root that can be * used to execute the given tool. - * - * <p>Note that you must not use this method to get the linker location, but use {@link - * #getLdExecutable} instead! */ public PathFragment getToolPathFragment(CppConfiguration.Tool tool) { return getToolPathFragment(toolPaths, tool); @@ -683,10 +675,6 @@ public final class CppToolchainInfo { return additionalMakeVariables; } - public PathFragment getLdExecutable() { - return ldExecutable; - } - public final boolean isLLVMCompiler() { // TODO(tmsriram): Checking for "llvm" does not handle all the cases. This // is temporary until the crosstool configuration is modified to add fields that diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java index cfd41e7dc6..4a3714b890 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java @@ -552,8 +552,7 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { ccProviderA.configureLinkerOptions( CompilationMode.FASTBUILD, LipoMode.OFF, - LinkingMode.FULLY_STATIC, - PathFragment.create("hello-world/ld"))) + LinkingMode.FULLY_STATIC)) .containsExactly( "linker-flag-A-1", "linker-flag-A-2", @@ -566,8 +565,7 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { ccProviderA.configureLinkerOptions( CompilationMode.DBG, LipoMode.OFF, - LinkingMode.DYNAMIC, - PathFragment.create("hello-world/ld"))) + LinkingMode.DYNAMIC)) .containsExactly( "linker-flag-A-1", "linker-flag-A-2", "linker-dbg-flag-A-1", "linker-dbg-flag-A-2") .inOrder(); @@ -575,8 +573,7 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { ccProviderA.configureLinkerOptions( CompilationMode.OPT, LipoMode.OFF, - LinkingMode.FULLY_STATIC, - PathFragment.create("hello-world/ld"))) + LinkingMode.FULLY_STATIC)) .containsExactly( "linker-flag-A-1", "linker-flag-A-2", "fully-static-flag-A-1", "fully-static-flag-A-2") .inOrder(); @@ -585,8 +582,7 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { ccProviderA.configureLinkerOptions( CompilationMode.OPT, LipoMode.BINARY, - LinkingMode.FULLY_STATIC, - PathFragment.create("hello-world/ld"))) + LinkingMode.FULLY_STATIC)) .containsExactly( "linker-flag-A-1", "linker-flag-A-2", "fully-static-flag-A-1", "fully-static-flag-A-2") .inOrder(); @@ -658,22 +654,19 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { ccProviderC.configureLinkerOptions( CompilationMode.FASTBUILD, LipoMode.OFF, - LinkingMode.FULLY_STATIC, - PathFragment.create("hello-world/ld"))) + LinkingMode.FULLY_STATIC)) .isEmpty(); assertThat( ccProviderC.configureLinkerOptions( CompilationMode.DBG, LipoMode.OFF, - LinkingMode.DYNAMIC, - PathFragment.create("hello-world/ld"))) + LinkingMode.DYNAMIC)) .isEmpty(); assertThat( ccProviderC.configureLinkerOptions( CompilationMode.OPT, LipoMode.OFF, - LinkingMode.FULLY_STATIC, - PathFragment.create("hello-world/ld"))) + LinkingMode.FULLY_STATIC)) .isEmpty(); assertThat(ccProviderC.getObjCopyOptionsForEmbedding()).isEmpty(); assertThat(ccProviderC.getLdOptionsForEmbedding()).isEmpty(); @@ -705,8 +698,7 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { ccProviderB.configureLinkerOptions( CompilationMode.DBG, lipoMode, - LinkingMode.DYNAMIC, - PathFragment.create("hello-world/ld"))) + LinkingMode.DYNAMIC)) .containsExactly( "linker-flag-B-1", "linker-flag-B-2", |