diff options
| author | Shigeki Ohtsu <ohtsu@ohtsu.org> | 2018-11-02 03:56:07 +0900 |
|---|---|---|
| committer | Sam Roberts <vieuxtech@gmail.com> | 2019-01-22 13:33:20 -0800 |
| commit | bff1348cfc7f386b9084219dd452b95a2a24be95 (patch) | |
| tree | 409b3e8072910f88007975bae737b49890ec1b36 /deps/openssl/config/generate_gypi.pl | |
| parent | 1c5b8e5e24b5fa4d14ba391c9cedc4c88fd02421 (diff) | |
| download | android-node-v8-bff1348cfc7f386b9084219dd452b95a2a24be95.tar.gz android-node-v8-bff1348cfc7f386b9084219dd452b95a2a24be95.tar.bz2 android-node-v8-bff1348cfc7f386b9084219dd452b95a2a24be95.zip | |
deps: fix MacOS and Win build for OpenSSL-1.1.1
Because llvm on MacOS does not support AVX-512, asm files need to be limited to
AVX-2 support even when they are generated on Linux. fake_gcc.pl returns the
fake llvm banner version for MacOS as if the assembler supports upto AVX-2.
For Windows, makefiles for nmake were updated in OpenSSL-1.1.1 and they are
rewritten into GNU makefile format by hand.
PR-URL: https://github.com/nodejs/node/pull/25381
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
Diffstat (limited to 'deps/openssl/config/generate_gypi.pl')
| -rwxr-xr-x | deps/openssl/config/generate_gypi.pl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/deps/openssl/config/generate_gypi.pl b/deps/openssl/config/generate_gypi.pl index 00bcaf5b9c..813bd28a86 100755 --- a/deps/openssl/config/generate_gypi.pl +++ b/deps/openssl/config/generate_gypi.pl @@ -155,6 +155,7 @@ my $clgypi = $cltemplate->fill_in( libapps_srcs => \@libapps_srcs, config => \%config, target => \%target, + asm => \$asm, arch => \$arch, lib_cppflags => \@lib_cppflags, is_win => \$is_win, |