Commit 1ee5c0dc authored by Tom Anderson's avatar Tom Anderson Committed by Commit Bot

Set CR_CLANG_REVISION on NaCl builds too

BUG=771191
R=thakis@chromium.org

Change-Id: I7f29c4d0951ee4ec253261a39c2f87640156ef59
Reviewed-on: https://chromium-review.googlesource.com/701643Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506659}
parent 9486be0e
......@@ -107,7 +107,7 @@ declare_args() {
use_cxx11_on_android = use_cxx11
}
if (is_clang && !is_nacl) {
if (is_clang) {
update_args = [ "--print-revision" ]
if (llvm_force_head_revision) {
update_args += [ "--llvm-force-head-revision" ]
......@@ -184,6 +184,7 @@ config("compiler") {
configs += [
# See the definitions below.
":clang_revision",
":compiler_cpu_abi",
":compiler_codegen",
]
......@@ -260,14 +261,6 @@ config("compiler") {
]
}
if (is_clang && !is_nacl) {
# This is here so that all files get recompiled after a clang roll and
# when turning clang on or off. (defines are passed via the command line,
# and build system rebuild things when their commandline changes). Nothing
# should ever read this define.
defines += [ "CR_CLANG_REVISION=\"$clang_revision\"" ]
}
# Non-Mac Posix compiler flags setup.
# -----------------------------------
if (is_posix && !(is_mac || is_ios)) {
......@@ -906,6 +899,16 @@ config("clang_stackrealign") {
}
}
config("clang_revision") {
if (is_clang) {
# This is here so that all files get recompiled after a clang roll and
# when turning clang on or off. (defines are passed via the command line,
# and build system rebuild things when their commandline changes). Nothing
# should ever read this define.
defines = [ "CR_CLANG_REVISION=\"$clang_revision\"" ]
}
}
config("compiler_arm_fpu") {
if (current_cpu == "arm" && !is_ios && !is_nacl) {
cflags = [ "-mfpu=$arm_fpu" ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment