commit | 378f2805b33a38a3403a8934dcb5e85559a6c527 | [log] [tgz] |
---|---|---|
author | Chinmay Garde <chinmaygarde@google.com> | Thu Sep 29 12:36:32 2016 -0700 |
committer | Chinmay Garde <chinmaygarde@google.com> | Thu Sep 29 12:36:32 2016 -0700 |
tree | 594af8a46a1384507fbbf68d101c22a5a34674b9 | |
parent | 922830c0aad900dd3d143eef1ba06faa83fe263b [diff] |
Use the integrated assembler on non-ARM platforms (Clang).
diff --git a/BUILD.gn b/BUILD.gn index 5a429c9..a82b12f 100644 --- a/BUILD.gn +++ b/BUILD.gn
@@ -49,7 +49,7 @@ sources = [] include_dirs = [ "src/include" ] - if (is_android && is_clang) { + if ((current_cpu == "arm" || current_cpu == "arm64") && is_android && is_clang) { # Disable the integrated assembler and use the one shipped with the NDK. import("//build/config/android/config.gni") rebased_android_toolchain_root =