Fix typo

RELNOTES: None. PiperOrigin-RevId: 275234136
bazelbuild · Oct 17, 2019 · f6c4b69 · f6c4b69
1 parent 2491ed3
commit f6c4b69
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
@@ -975,7 +975,7 @@ public static String computeCcFlags(RuleContext ruleContext, TransitiveInfoColle
     //   will be gone.
     String sysrootCcFlags =
         computeCcFlagForSysroot(
-            toolchainProvider.getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas(),
+            toolchainProvider.getCppConfigurationEvenThoughItCanBeDifferentThanWhatTargetHas(),
             toolchainProvider);
 
     // Fetch additional flags from the FeatureConfiguration.
@@ -1022,7 +1022,7 @@ private static List<String> computeCcFlagsFromFeatureConfig(
       cppConfiguration = ruleContext.getFragment(CppConfiguration.class);
     } else {
       cppConfiguration =
-          toolchainProvider.getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas();
+          toolchainProvider.getCppConfigurationEvenThoughItCanBeDifferentThanWhatTargetHas();
     }
     try {
       featureConfiguration =

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java
@@ -141,7 +141,7 @@ public FeatureConfigurationForStarlark configureFeatures(
     }
     CppConfiguration cppConfiguration =
         ruleContext == null
-            ? toolchain.getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas()
+            ? toolchain.getCppConfigurationEvenThoughItCanBeDifferentThanWhatTargetHas()
             : ruleContext.getRuleContext().getFragment(CppConfiguration.class);
     // buildOptions are only used when --incompatible_enable_cc_toolchain_resolution is flipped,
     // and that will only be flipped when --incompatible_require_ctx_in_configure_features is

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
@@ -525,7 +525,7 @@ public NestedSet<Artifact> getCoverageFiles() {
   }
 
   public NestedSet<Artifact> getLibcLink(CppConfiguration cppConfiguration) {
-    if (cppConfiguration.equals(getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas())) {
+    if (cppConfiguration.equals(getCppConfigurationEvenThoughItCanBeDifferentThanWhatTargetHas())) {
       return libcLink;
     } else {
       return targetLibcLink;
@@ -696,7 +696,7 @@ public boolean supportsInterfaceSharedLibraries(FeatureConfiguration featureConf
    * <p>Once toolchain transitions are implemented, we can safely use the CppConfiguration from the
    * toolchain in rules.
    */
-  CppConfiguration getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas() {
+  CppConfiguration getCppConfigurationEvenThoughItCanBeDifferentThanWhatTargetHas() {
     return cppConfiguration;
   }
 
@@ -727,7 +727,7 @@ public CcToolchainVariables getBuildVariables(
    * @param cppConfiguration
    */
   public ImmutableList<Artifact> getBuiltinIncludeFiles(CppConfiguration cppConfiguration) {
-    if (cppConfiguration.equals(getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas())) {
+    if (cppConfiguration.equals(getCppConfigurationEvenThoughItCanBeDifferentThanWhatTargetHas())) {
       return builtinIncludeFiles;
     } else {
       return targetBuiltinIncludeFiles;
@@ -756,7 +756,7 @@ public String getSysroot() {
   }
 
   public PathFragment getSysrootPathFragment(CppConfiguration cppConfiguration) {
-    if (cppConfiguration.equals(getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas())) {
+    if (cppConfiguration.equals(getCppConfigurationEvenThoughItCanBeDifferentThanWhatTargetHas())) {
       return sysroot;
     } else {
       return targetSysroot;
@@ -953,7 +953,7 @@ public PathFragment getDefaultSysroot() {
   }
 
   public boolean requireCtxInConfigureFeatures() {
-    return getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas()
+    return getCppConfigurationEvenThoughItCanBeDifferentThanWhatTargetHas()
         .requireCtxInConfigureFeatures();
   }
 

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionTemplate.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionTemplate.java
@@ -172,7 +172,7 @@ protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp)
         cppCompileActionBuilder.getBuiltinIncludeDirectories(),
         cppCompileActionBuilder.buildInputsForInvalidation(),
         toolchain
-            .getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas()
+            .getCppConfigurationEvenThoughItCanBeDifferentThanWhatTargetHas()
             .validateTopLevelHeaderInclusions());
   }