| Index: third_party/boringssl/boringssl.gyp
|
| diff --git a/third_party/boringssl/boringssl.gyp b/third_party/boringssl/boringssl.gyp
|
| index b20d0d4ef5e9da8477fc0780444335eef7ae1680..f3a169d508a597f5f3a8cfff1d300905da63c02b 100644
|
| --- a/third_party/boringssl/boringssl.gyp
|
| +++ b/third_party/boringssl/boringssl.gyp
|
| @@ -46,7 +46,7 @@
|
| }],
|
| ['target_arch == "ia32"', {
|
| 'conditions': [
|
| - ['OS == "mac"', {
|
| + ['OS == "mac" or OS == "ios"', {
|
| 'sources': [ '<@(boringssl_mac_x86_sources)' ],
|
| }],
|
| ['OS == "linux" or OS == "android"', {
|
| @@ -63,14 +63,14 @@
|
| '../yasm/yasm_compile.gypi',
|
| ],
|
| }],
|
| - ['OS != "mac" and OS != "linux" and OS != "win" and OS != "android"', {
|
| + ['OS != "mac" and OS != "ios" and OS != "linux" and OS != "win" and OS != "android"', {
|
| 'defines': [ 'OPENSSL_NO_ASM' ],
|
| }],
|
| ]
|
| }],
|
| ['target_arch == "x64"', {
|
| 'conditions': [
|
| - ['OS == "mac"', {
|
| + ['OS == "mac" or OS == "ios"', {
|
| 'sources': [ '<@(boringssl_mac_x86_64_sources)' ],
|
| }],
|
| ['OS == "linux" or OS == "android"', {
|
| @@ -87,7 +87,7 @@
|
| '../yasm/yasm_compile.gypi',
|
| ],
|
| }],
|
| - ['OS != "mac" and OS != "linux" and OS != "win" and OS != "android"', {
|
| + ['OS != "mac" and OS != "ios" and OS != "linux" and OS != "win" and OS != "android"', {
|
| 'defines': [ 'OPENSSL_NO_ASM' ],
|
| }],
|
| ]
|
|
|