Chromium Code Reviews| Index: build/secondary/third_party/nss/BUILD.gn |
| diff --git a/build/secondary/third_party/nss/BUILD.gn b/build/secondary/third_party/nss/BUILD.gn |
| index e51fb21ac62595f27d9ade6b265e06bafeb32619..64d6e88ad688e79058533c8026c5abdef6862e93 100644 |
| --- a/build/secondary/third_party/nss/BUILD.gn |
| +++ b/build/secondary/third_party/nss/BUILD.gn |
| @@ -1096,7 +1096,7 @@ if (is_linux) { |
| defines += [ "NSS_DISABLE_ROOT_CERTS" ] |
| } |
| - if (current_cpu == "x64" && !is_win) { |
| + if (current_cpu == "x64" && !is_win && !is_ios) { |
| sources -= [ |
| "nss/lib/freebl/chacha20/chacha20.c", |
| "nss/lib/freebl/poly1305/poly1305.c", |
| @@ -1177,6 +1177,9 @@ if (is_linux) { |
| # mpi_x86_asm.c contains MSVC inline assembly code. |
| "nss/lib/freebl/mpi/mpi_x86_asm.c", |
| ] |
| + if (is_ios) { |
| + sources -= [ "nss/lib/freebl/intel-aes-x86-masm.asm" ] |
|
Nico
2015/08/18 15:15:43
Shouldn't .asm files be ignored automatically on n
sherouk
2015/08/18 16:06:23
No, they are not filtered. This target is only def
Nico
2015/08/18 17:47:05
There's a main waterfall bot doing GN bots on OS X
sherouk
2015/08/19 13:14:32
I was not aware of that bot, Thanks! This bot does
Nico
2015/08/19 15:28:05
Ah, iOS is the only platform we still build NSS on
sherouk
2015/08/19 16:50:08
Done, Thank you!
|
| + } |
| } |
| if (is_clang) { |