From 11b64fd1d37810524feb55093f482197aa9c785d Mon Sep 17 00:00:00 2001 From: cpeyser Date: Tue, 24 Oct 2017 20:39:27 +0200 Subject: Move CppConfiguration#getAbi and #getAbiGlibcVersion to CcToolchainProvider. PiperOrigin-RevId: 173287598 --- .../build/lib/rules/cpp/CcToolchainProvider.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java') 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 2f30b35c7e..097d4674eb 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 @@ -382,6 +382,27 @@ public final class CcToolchainProvider extends ToolchainInfo { return toolchainInfo.getToolPathFragment(tool); } + /** + * Returns the abi we're using, which is a gcc version. E.g.: "gcc-3.4". Note that in practice we + * might be using gcc-3.4 as ABI even when compiling with gcc-4.1.0, because ABIs are backwards + * compatible. + */ + // TODO(bazel-team): The javadoc should clarify how this is used in Blaze. + public String getAbi() { + return toolchainInfo.getAbi(); + } + + /** + * Returns the glibc version used by the abi we're using. This is a glibc version number (e.g., + * "2.2.2"). Note that in practice we might be using glibc 2.2.2 as ABI even when compiling with + * gcc-4.2.2, gcc-4.3.1, or gcc-4.4.0 (which use glibc 2.3.6), because ABIs are backwards + * compatible. + */ + // TODO(bazel-team): The javadoc should clarify how this is used in Blaze. + public String getAbiGlibcVersion() { + return toolchainInfo.getAbiGlibcVersion(); + } + @SkylarkCallable( name = "unfiltered_compiler_options_do_not_use", doc = -- cgit v1.2.3