Bug 1536259 - Add missing ANDROID define for clang runtime builds. r=glandium
authorChris Manchester <cmanchester@mozilla.com>
Tue, 19 Mar 2019 17:47:21 +0000
changeset 465072 b9d1160ecb0dd78052f8e0bf3e759e104de070e7
parent 465071 79e130a002553dc7a2e519c2bedcaf0d73d3e9c7
child 465073 1bd54f8dfd9e877154a8a22992008ef74910fe37
push id35732
push useropoprus@mozilla.com
push dateWed, 20 Mar 2019 10:52:37 +0000
treeherdermozilla-central@708979f9c3f3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1536259
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 1536259 - Add missing ANDROID define for clang runtime builds. r=glandium Differential Revision: https://phabricator.services.mozilla.com/D23957
build/build-clang/build-clang.py
--- a/build/build-clang/build-clang.py
+++ b/build/build-clang/build-clang.py
@@ -299,16 +299,17 @@ def build_one_stage(cc, cxx, asm, ld, ar
             cmake_args += [
                 "-DBUILTINS_%s_ANDROID=1" % target,
                 "-DBUILTINS_%s_CMAKE_ASM_FLAGS=%s" % (target, rt_asm_flags),
                 "-DBUILTINS_%s_CMAKE_CXX_FLAGS=%s" % (target, rt_cxx_flags),
                 "-DBUILTINS_%s_CMAKE_C_FLAGS=%s" % (target, rt_c_flags),
                 "-DBUILTINS_%s_CMAKE_EXE_LINKER_FLAGS=%s" % (target, android_link_flags),
                 "-DBUILTINS_%s_CMAKE_SHARED_LINKER_FLAGS=%s" % (target, android_link_flags),
                 "-DBUILTINS_%s_CMAKE_SYSROOT=%s" % (target, sysroot_dir),
+                "-DRUNTIMES_%s_ANDROID=1" % target,
                 "-DRUNTIMES_%s_CMAKE_ASM_FLAGS=%s" % (target, rt_asm_flags),
                 "-DRUNTIMES_%s_CMAKE_CXX_FLAGS=%s" % (target, rt_cxx_flags),
                 "-DRUNTIMES_%s_CMAKE_C_FLAGS=%s" % (target, rt_c_flags),
                 "-DRUNTIMES_%s_CMAKE_EXE_LINKER_FLAGS=%s" % (target, android_link_flags),
                 "-DRUNTIMES_%s_CMAKE_SHARED_LINKER_FLAGS=%s" % (target, android_link_flags),
                 "-DRUNTIMES_%s_CMAKE_SYSROOT=%s" % (target, sysroot_dir),
                 "-DRUNTIMES_%s_COMPILER_RT_BUILD_PROFILE=ON" % target,
                 "-DRUNTIMES_%s_COMPILER_RT_BUILD_SANITIZERS=OFF" % target,