Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-19 13:23:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

Ensure clang-cl is always used in windows builds.

Browse source
This commit is contained in:
Josh Matthews 2021-02-25 10:02:41 -05:00
parent 30143558b3
commit a6b872a9d1
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
python/servo/build_commands.py
View file

@ -653,15 +653,7 @@ class MachCommands(CommandBase):
for key in env: for key in env:
print((key, env[key])) print((key, env[key]))
if sys.platform == "win32": 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:
env.setdefault("CC", "clang") env.setdefault("CC", "clang")
env.setdefault("CXX", "clang++") env.setdefault("CXX", "clang++")

8
python/servo/command_base.py
View file

@ -610,6 +610,14 @@ install them, let us know by filing a bug!")
extra_path += [self.msvc_package_dir("nuget")] extra_path += [self.msvc_package_dir("nuget")]
extra_path += [path.join(self.msvc_package_dir("xargo"))] 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] arch = (target or host_triple()).split('-')[0]
vcpkg_arch = { vcpkg_arch = {
"x86_64": "x64-windows", "x86_64": "x64-windows",