| 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)
|
|
|