james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

enable asm for windows openssl builds

Browse Source 
also choose the correct target for 32bits
This commit is contained in:
Klas Lindfors
2016-08-12 09:49:25 +02:00
parent 0d7854540e
commit 151fe5b617
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
windows.mk
+3 -3
View File
@@ -47,8 +47,8 @@ doit:
curl -L -O "https://www.openssl.org/source/openssl-$(OPENSSLVERSION).tar.gz" && \ curl -L -O "https://www.openssl.org/source/openssl-$(OPENSSLVERSION).tar.gz" && \
tar xfa openssl-$(OPENSSLVERSION).tar.gz && \ tar xfa openssl-$(OPENSSLVERSION).tar.gz && \
cd openssl-$(OPENSSLVERSION) && \ cd openssl-$(OPENSSLVERSION) && \
CROSS_COMPILE="$(HOST)-" ./Configure mingw64 no-asm no-ssl2 no-ssl3 no-engines shared --prefix=$(PWD)/tmp$(ARCH)/root -static-libgcc && \ CROSS_COMPILE="$(HOST)-" ./Configure mingw$(64) no-ssl2 no-ssl3 no-engines shared --prefix=$(PWD)/tmp$(ARCH)/root -static-libgcc && \
make all install_sw && \ make depend all install_sw && \
cp LICENSE $(PWD)/tmp$(ARCH)/root/licenses/openssl.txt && \ cp LICENSE $(PWD)/tmp$(ARCH)/root/licenses/openssl.txt && \
rm -rf $(PWD)/tmp$(ARCH)/root/ssl/ && \ rm -rf $(PWD)/tmp$(ARCH)/root/ssl/ && \
rm $(PWD)/tmp$(ARCH)/root/bin/openssl.exe && \ rm $(PWD)/tmp$(ARCH)/root/bin/openssl.exe && \
@@ -70,7 +70,7 @@ doit:
$(MAKE) -f windows.mk doit ARCH=32 HOST=i686-w64-mingw32 CHECK=check $(MAKE) -f windows.mk doit ARCH=32 HOST=i686-w64-mingw32 CHECK=check
64bit: 64bit:
$(MAKE) -f windows.mk doit ARCH=64 HOST=x86_64-w64-mingw32 CHECK=check $(MAKE) -f windows.mk doit ARCH=64 HOST=x86_64-w64-mingw32 64=64 CHECK=check
upload: upload:
@if test ! -d "$(YUBICO_GITHUB_REPO)"; then \ @if test ! -d "$(YUBICO_GITHUB_REPO)"; then \