Browse files

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. 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: #25381
Reviewed-By: Daniel Bevenius <>
Reviewed-By: Shigeki Ohtsu <>
Backport-PR-URL: #25688
  • Loading branch information...
shigeki authored and targos committed Nov 1, 2018
1 parent e204399 commit 0a0f15f768c1bbeaea7554847e16a08411b8c663
@@ -15,6 +15,7 @@ linux-armv4 linux-elf linux-x32 linux-x86_64 linux-ppc \
linux-ppc64 linux-ppc64le linux32-s390x linux64-s390x \
solaris-x86-gcc solaris64-x86_64-gcc VC-WIN64A VC-WIN32

CC = gcc
CONFIGURE = ./Configure
# no-comp: against CRIME attack
# no-shared: openssl-cli needs static link
@@ -44,8 +45,11 @@ all: $(ARCHS) replace
# Remove openssl .gitignore to follow nodejs .gitignore
if [ -e $(GITIGNORE) ]; then rm $(GITIGNORE); fi
# Confgure asm and generate asm sources
if [ "$(findstring darwin, $@)" = "" ]; then \
else \
cd $(OPSSL_SRC); $(NO_WARN_ENV) ARC=$@ CC=./ $(PERL) $(CONFIGURE) $(COPTS) $@; \
$(PERL) -w -I$(OPSSL_SRC) $(GENERATE) asm $@
# Confgure no-asm and generate no-asm sources
@@ -61,4 +65,4 @@ replace:

find archs \( -name \*.S -o -name \*.s -o -name \*.asm -o \
-name \*.gypi -o -name \*.h -o -name \*.pm \) -exec rm "{}" \;
-name \*.gypi -o -name \*.h -o -name \*.pm -o -name \*.rc \) -exec rm "{}" \;
Oops, something went wrong.

0 comments on commit 0a0f15f

Please sign in to comment.