From f447c6b1ec485964686c3d8bd92fa78873398a18 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Mon, 17 Jun 2019 08:19:49 -0400
Subject: [PATCH] Force clang use on all platforms.

---
 python/servo/build_commands.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index 26f5da3ca25..6af8b1bd3a0 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -317,8 +317,11 @@ class MachCommands(CommandBase):
             env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C debug_assertions"
 
         if sys.platform == "win32":
-            env["CC"] = "clang-cl.exe"
-            env["CXX"] = "clang-cl.exe"
+            env["CC"] = env.get("CC", "clang-cl.exe")
+            env["CXX"] = env.get("CXX", "clang-cl.exe")
+        else:
+            env["CC"] = env.get("CC", "clang")
+            env["CXX"] = env.get("CXX", "clang++")
 
         host = host_triple()
         if 'apple-darwin' in host and (not target or target == host):