diff options
| author | Stephen Hines <srhines@google.com> | 2017-02-01 21:25:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-02-01 21:25:03 +0000 |
| commit | e25bc9ba83c5d00a95aa06bda668e731f740a656 (patch) | |
| tree | 23c180b62b1e01cf0c5f1ee40aa370f13cce7191 /cc | |
| parent | 7a108bccaddb72b6ef76e1d7cd22136c7cd12c52 (diff) | |
| parent | d19f58a162abee7d294d9c939b613eac94ec3bf9 (diff) | |
| download | build_soong-e25bc9ba83c5d00a95aa06bda668e731f740a656.tar.gz build_soong-e25bc9ba83c5d00a95aa06bda668e731f740a656.tar.bz2 build_soong-e25bc9ba83c5d00a95aa06bda668e731f740a656.zip | |
Merge "Switch to clang-3688880."
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/config/global.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/config/global.go b/cc/config/global.go index 6f144865..e248040d 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -130,7 +130,7 @@ func init() { if override := config.(android.Config).Getenv("LLVM_PREBUILTS_VERSION"); override != "" { return override, nil } - return "clang-3289846", nil + return "clang-3688880", nil }) pctx.StaticVariable("ClangPath", "${ClangBase}/${HostPrebuiltTag}/${ClangVersion}") pctx.StaticVariable("ClangBin", "${ClangPath}/bin") @@ -139,7 +139,7 @@ func init() { if override := config.(android.Config).Getenv("LLVM_RELEASE_VERSION"); override != "" { return override, nil } - return "3.8", nil + return "4.0", nil }) pctx.StaticVariable("ClangAsanLibDir", "${ClangPath}/lib64/clang/${ClangShortVersion}/lib/linux") |