diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2019-06-17 13:10:03 -0400 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2019-06-27 18:40:56 +0200 |
| commit | 6167005997186e2b05a4e79cac69cf27fadf7b3f (patch) | |
| tree | 0adf166c0cfed503842acea212432a23db409fdc /python/servo/build_commands.py | |
| parent | f447c6b1ec485964686c3d8bd92fa78873398a18 (diff) | |
| download | servo-6167005997186e2b05a4e79cac69cf27fadf7b3f.tar.gz servo-6167005997186e2b05a4e79cac69cf27fadf7b3f.zip | |
Set CC/CXX defaults right before starting cargo build.
Diffstat (limited to 'python/servo/build_commands.py')
| -rw-r--r-- | python/servo/build_commands.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 6af8b1bd3a0..582da195356 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -316,13 +316,6 @@ class MachCommands(CommandBase): if with_debug_assertions: env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C debug_assertions" - if sys.platform == "win32": - env["CC"] = env.get("CC", "clang-cl.exe") - env["CXX"] = env.get("CXX", "clang-cl.exe") - else: - env["CC"] = env.get("CC", "clang") - env["CXX"] = env.get("CXX", "clang++") - host = host_triple() if 'apple-darwin' in host and (not target or target == host): if 'CXXFLAGS' not in env: @@ -612,6 +605,13 @@ 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") + else: + env.setdefault("CC", "clang") + env.setdefault("CXX", "clang++") + status = self.call_rustup_run(["cargo", "build"] + opts, env=env, verbose=verbose) elapsed = time() - build_start |