diff options
author | bors-servo <servo-ops@mozilla.com> | 2021-03-11 21:08:05 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-11 21:08:05 -0500 |
commit | 5dd0cba51d74ccbf6d745d92e54b840269f717c6 (patch) | |
tree | 73534349ad549284e2f74916e5c16e1c0bfb8dea /python/servo/command_base.py | |
parent | 14fbe153e2da6973d5ae15125b4d7e5283d3f7da (diff) | |
parent | c66255ba5e308726f7e9ffcea85577e3c56bb206 (diff) | |
download | servo-5dd0cba51d74ccbf6d745d92e54b840269f717c6.tar.gz servo-5dd0cba51d74ccbf6d745d92e54b840269f717c6.zip |
Auto merge of #27865 - servo:github-actions-dev, r=jdm
Add Github Actions workflow for mac/linux/windows builds
Diffstat (limited to 'python/servo/command_base.py')
-rw-r--r-- | python/servo/command_base.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 0ba6a823756..1a5cc75e746 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -609,6 +609,14 @@ install them, let us know by filing a bug!") extra_path += [path.join(self.msvc_package_dir("ninja"), "bin")] extra_path += [self.msvc_package_dir("nuget")] + 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", |