Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(774)

Unified Diff: third_party/boringssl/BUILD.gn

Issue 1588723004: Fix gn gen failure on arm64 cause by boringssl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/boringssl/BUILD.gn
diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
index a102de83e376db0ac2572953dc8ad022607a9d9c..a6415da661445c313479566ec0221a3ac9a7bbf2 100644
--- a/third_party/boringssl/BUILD.gn
+++ b/third_party/boringssl/BUILD.gn
@@ -45,6 +45,7 @@ component("boringssl") {
public_configs = [ ":openssl_config" ]
+ asmflags = []
cflags = []
defines = [
"BORINGSSL_IMPLEMENTATION",
@@ -70,7 +71,7 @@ component("boringssl") {
if (current_cpu == "arm" && is_clang) {
# TODO(hans) Enable integrated-as (crbug.com/124610).
- asmflags = [ "-fno-integrated-as" ]
+ asmflags += [ "-fno-integrated-as" ]
if (is_android) {
rebased_android_toolchain_root =
rebase_path(android_toolchain_root, root_build_dir)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698