Merge "Default to hermetic clang on Linux."
diff --git a/.travis.yml b/.travis.yml
index 481e2b1..8691c5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,7 +53,7 @@
apt:
packages:
- clang
- env: CFG=linux_trusty-clang-x86_64-debug GN_ARGS="is_debug=true"
+ env: CFG=linux_trusty-clang-x86_64-debug GN_ARGS="is_debug=true is_hermetic_clang=false"
- os: linux
dist: trusty
sudo: true
diff --git a/gn/standalone/toolchain/llvm.gni b/gn/standalone/toolchain/llvm.gni
index ae490ad..f6bd038 100644
--- a/gn/standalone/toolchain/llvm.gni
+++ b/gn/standalone/toolchain/llvm.gni
@@ -15,7 +15,7 @@
import("//gn/standalone/sanitizers/vars.gni")
declare_args() {
- is_hermetic_clang = is_clang && is_linux_host && using_sanitizer
+ is_hermetic_clang = is_clang && is_linux_host
}
assert(!is_hermetic_clang || is_clang, "is_hermetic_clang requires is_clang")