1 files changed, 10 insertions, 5 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationHelper.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationHelper.java
index fa18959eea..a3214fe0cd 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationHelper.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationHelper.java
@@ -15,6 +15,7 @@
 package com.google.devtools.build.lib.rules.cpp;
 
 import com.google.devtools.build.lib.analysis.util.AnalysisMock;
+import com.google.devtools.build.lib.util.OS;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig;
@@ -55,6 +56,10 @@ public class CrosstoolConfigurationHelper {
     overwriteCrosstoolFile(workspace, TextFormat.printToString(release.build()));
   }
 
+  public static String defaultCpu() {
+    return OS.getCurrent() == OS.DARWIN ? "darwin" : "k8";
+  }
+
   /**
    * Overwrites the default CROSSTOOL file with a reasonable toolchain.
    */
@@ -68,18 +73,18 @@ public class CrosstoolConfigurationHelper {
         CrosstoolConfig.CrosstoolRelease.newBuilder()
             .setMajorVersion("12")
             .setMinorVersion("0")
-            .setDefaultTargetCpu("k8")
+            .setDefaultTargetCpu(defaultCpu())
             .addDefaultToolchain(
                 DefaultCpuToolchain.newBuilder()
-                    .setCpu("k8")
-                    .setToolchainIdentifier("k8-toolchain"));
+                    .setCpu(defaultCpu())
+                    .setToolchainIdentifier(defaultCpu() + "-toolchain"));
     CrosstoolConfig.CToolchain.Builder toolchainBuilder = newIncompleteToolchain();
     toolchainBuilder
-        .setToolchainIdentifier("k8-toolchain")
+        .setToolchainIdentifier(defaultCpu() + "-toolchain")
         .setHostSystemName("i686-unknown-linux-gnu")
         .setTargetSystemName("i686-unknown-linux-gnu")
         .setTargetCpu("k8")
-        .setTargetLibc("glibc-2.3.6-grte")
+        .setTargetLibc("glibc-2.3.6")
         .setCompiler("gcc-4.3.1")
         .setAbiVersion("gcc-3.4")
         .setAbiLibcVersion("2.3.2")