aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/command_base.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/command_base.py
parent30143558b3d902f9e5f43f93179b6f17d17fcd5b (diff)
downloadservo-a6b872a9d1fec5f572fe53fc85d863f7bce78036.tar.gz
servo-a6b872a9d1fec5f572fe53fc85d863f7bce78036.zip
Ensure clang-cl is always used in windows builds.
Diffstat (limited to 'python/servo/command_base.py')
-rw-r--r--python/servo/command_base.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index fb1c79b8b3c..42d8535f768 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -610,6 +610,14 @@ install them, let us know by filing a bug!")
extra_path += [self.msvc_package_dir("nuget")]
extra_path += [path.join(self.msvc_package_dir("xargo"))]
+ 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"
+
arch = (target or host_triple()).split('-')[0]
vcpkg_arch = {
"x86_64": "x64-windows",