Bug 1542400 - Don't set LLVM_DEFAULT_TARGET_TRIPLE to possibly erroneous value when building clang runtimes. r=froydnj
authorChris Manchester <cmanchester@mozilla.com>
Mon, 08 Apr 2019 16:28:24 +0000
changeset 468400 dfa27849ea1b47d3eb48453441c9446790a2132e
parent 468399 8ef30ebad16c538e39b9fb4648a551a3257d9729
child 468401 ad9d1c77d60b43669f4b61ba618cdf89cc855473
child 468405 5914a425bc67dc5131c9625052362ebd777aa841
push id35835
push useraciure@mozilla.com
push dateMon, 08 Apr 2019 19:00:29 +0000
treeherdermozilla-central@40456af7da1c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1542400
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1542400 - Don't set LLVM_DEFAULT_TARGET_TRIPLE to possibly erroneous value when building clang runtimes. r=froydnj Differential Revision: https://phabricator.services.mozilla.com/D26384
build/build-clang/build-clang.py
--- a/build/build-clang/build-clang.py
+++ b/build/build-clang/build-clang.py
@@ -265,19 +265,17 @@ def build_one_stage(cc, cxx, asm, ld, ar
                 "-DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-darwin11"
             ]
         return cmake_args
 
     cmake_args = []
 
     if is_final_stage and android_targets:
         cmake_args += [
-            "-DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=%s" % android_targets.keys()[0],
             "-DLLVM_BUILTIN_TARGETS=%s" % ";".join(android_targets),
-            "-DLLVM_DEFAULT_TARGET_TRIPLE=%s" % android_targets.keys()[0],
             "-DLLVM_LIBDIR_SUFFIX=64",
             "-DLLVM_RUNTIME_TARGETS=%s" % ";".join(android_targets),
         ]
 
         android_link_flags = "-fuse-ld=lld"
 
         for target, cfg in android_targets.iteritems():
             sysroot_dir = cfg["ndk_sysroot"]