diff options
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java | 5 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java | 7 |
2 files changed, 5 insertions, 7 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 980d817a93..622416056f 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 @@ -654,6 +654,11 @@ public final class CcToolchainProvider extends ToolchainInfo { return toolchainInfo.getTargetGnuSystemName(); } + /** Returns the architecture component of the GNU System Name */ + public String getGnuSystemArch() { + return toolchainInfo.getGnuSystemArch(); + } + // Not all of CcToolchainProvider is exposed to Skylark, which makes implementing deep equality // impossible: if Java-only parts are considered, the behavior is surprising in Skylark, if they // are not, the behavior is surprising in Java. Thus, object identity it is. 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 85a90b5ae0..653ab3727e 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 @@ -1284,13 +1284,6 @@ public class CppConfiguration extends BuildConfiguration.Fragment { } /** - * Returns the architecture component of the GNU System Name - */ - public String getGnuSystemArch() { - return cppToolchainInfo.getGnuSystemArch(); - } - - /** * Returns whether the configuration's purpose is only to collect LIPO-related data. */ public boolean isLipoContextCollector() { |