Skip to content

Commit

Permalink
Update openSSL files for the win32 build
Browse files Browse the repository at this point in the history
  • Loading branch information
VincentBlondeau committed Apr 12, 2020
1 parent 2d4139e commit 2be5c4a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
3 changes: 1 addition & 2 deletions build.win32x86/third-party/Makefile.openssl
Expand Up @@ -21,7 +21,6 @@ $(OPENSSLARCHIVE):

$(THIRDPARTYLIBDIR)/$(OPENSSLLIBNAME): $(OPENSSLARCHIVE)
tar x -f $(OPENSSLARCHIVE) -C $(THIRDPARTYDIR)
sed -i 's/symlink/copy/g' $(OPENSSLDIR)/util/mklink.pl
cd $(OPENSSLDIR) \
&& CC='$(CC)' \
LD='$(LD)' \
Expand All @@ -31,7 +30,7 @@ $(THIRDPARTYLIBDIR)/$(OPENSSLLIBNAME): $(OPENSSLARCHIVE)
DLLWRAP='$(DLLWRAP)' \
./Configure mingw --prefix='$(THIRDPARTYOUTDIR)' shared $(THIRDPARTY_CFLAGS) \
&& make \
&& make install
&& make install_sw

# Assuming building ssleay32.dll will also build libeay32.dll
$(OPENSSLLIB): $(THIRDPARTYLIBDIR)/$(OPENSSLLIBNAME)
Expand Down
1 change: 0 additions & 1 deletion build.win64x64/third-party/Makefile.openssl
Expand Up @@ -20,7 +20,6 @@ $(OPENSSLARCHIVE):
$(WGET) -O $(OPENSSLARCHIVE) $(OPENSSLURL)

$(THIRDPARTYLIBDIR)/$(OPENSSLLIBNAME): $(OPENSSLARCHIVE)
@echo "ESTEBAN: ENTER"
tar x -f $(OPENSSLARCHIVE) -C $(THIRDPARTYDIR)
cd $(OPENSSLDIR) \
&& CC=x86_64-w64-mingw32-gcc \
Expand Down

0 comments on commit 2be5c4a

Please sign in to comment.