diff options
| -rw-r--r-- | python/servo/build_commands.py | 10 | ||||
| -rw-r--r-- | python/servo/command_base.py | 8 |
2 files changed, 9 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++") 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", |