diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2019-05-06 11:36:35 -0400 |
|---|---|---|
| committer | Josh Matthews <josh@joshmatthews.net> | 2019-05-10 22:47:02 -0400 |
| commit | 8420b299ca18644c130e1cefbdba4f089b89b3a2 (patch) | |
| tree | 53ed1172621ccbcb6bbd0b02c3078a7e8bd66037 /python/servo/build_commands.py | |
| parent | 4328713f71d5bc389ecd47e78bfe9b8087b8c104 (diff) | |
| download | servo-8420b299ca18644c130e1cefbdba4f089b89b3a2.tar.gz servo-8420b299ca18644c130e1cefbdba4f089b89b3a2.zip | |
Update CI to use Clang instead of outdated GCC.
Diffstat (limited to 'python/servo/build_commands.py')
| -rw-r--r-- | python/servo/build_commands.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index abe4e1003f9..cc8eb40c48a 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -309,6 +309,12 @@ class MachCommands(CommandBase): env["CC"] = "clang-cl.exe" env["CXX"] = "clang-cl.exe" + host = host_triple() + if 'apple-darwin' in host and (not target or target == host): + if 'CXXFLAGS' not in env: + env['CXXFLAGS'] = '' + env["CXXFLAGS"] += "-mmacosx-version-min=10.10" + if android: if "ANDROID_NDK" not in env: print("Please set the ANDROID_NDK environment variable.") @@ -550,7 +556,7 @@ class MachCommands(CommandBase): # The toolchain commands env.setdefault("AR", path.join(env["ANDROID_TOOLCHAIN_DIR"], "bin", "aarch64-linux-android-ar")) - env.setdefault("AS", path.join(env["ANDROID_TOOLCHAIN_DIR"], "bin", "aarch64-linux-android-as")) + env.setdefault("AS", path.join(env["ANDROID_TOOLCHAIN_DIR"], "bin", "aarch64-linux-android-gcc")) env.setdefault("CC", path.join(env["ANDROID_TOOLCHAIN_DIR"], "bin", "aarch64-linux-android-clang")) env.setdefault("CPP", path.join(env["ANDROID_TOOLCHAIN_DIR"], "bin", "aarch64-linux-android-clang -E")) env.setdefault("CXX", path.join(env["ANDROID_TOOLCHAIN_DIR"], "bin", "aarch64-linux-android-clang++")) @@ -563,8 +569,8 @@ class MachCommands(CommandBase): # Undo all of that when compiling build tools for the host env.setdefault("HOST_CFLAGS", "") env.setdefault("HOST_CXXFLAGS", "") - env.setdefault("HOST_CC", "gcc") - env.setdefault("HOST_CXX", "g++") + env.setdefault("HOST_CC", "/usr/local/opt/llvm/bin/clang") + env.setdefault("HOST_CXX", "/usr/local/opt/llvm/bin/clang++") env.setdefault("HOST_LD", "ld") # Some random build configurations |