aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/build_commands.py
diff options
context:
space:
mode:
authorJosh Matthews <josh@joshmatthews.net>2021-02-25 10:02:41 -0500
committerJosh Matthews <josh@joshmatthews.net>2021-02-26 04:20:23 -0500
commita6b872a9d1fec5f572fe53fc85d863f7bce78036 (patch)
treea6de9c38b1e7b4c6c44d82781e4954ec7bf3ee10 /python/servo/build_commands.py
parent30143558b3d902f9e5f43f93179b6f17d17fcd5b (diff)
downloadservo-a6b872a9d1fec5f572fe53fc85d863f7bce78036.tar.gz
servo-a6b872a9d1fec5f572fe53fc85d863f7bce78036.zip
Ensure clang-cl is always used in windows builds.
Diffstat (limited to 'python/servo/build_commands.py')
-rw-r--r--python/servo/build_commands.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index 11b53be6a89..1d537acd0e9 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -653,15 +653,7 @@ class MachCommands(CommandBase):
for key in env:
print((key, env[key]))
- if sys.platform == "win32":
- env.setdefault("CC", "clang-cl.exe")
- env.setdefault("CXX", "clang-cl.exe")
- if uwp:
- env.setdefault("TARGET_CFLAGS", "")
- env.setdefault("TARGET_CXXFLAGS", "")
- env["TARGET_CFLAGS"] += " -DWINAPI_FAMILY=WINAPI_FAMILY_APP"
- env["TARGET_CXXFLAGS"] += " -DWINAPI_FAMILY=WINAPI_FAMILY_APP"
- else:
+ if sys.platform != "win32":
env.setdefault("CC", "clang")
env.setdefault("CXX", "clang++")