Merge pull request #47953 from lopsided98/openssl-arm

openssl: don't autodetect platform on armv6/7l
This commit is contained in:
Renaud 2018-10-28 14:08:02 +01:00 committed by GitHub
commit de8f3b422a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -51,6 +51,8 @@ let
configureScript = {
"x86_64-darwin" = "./Configure darwin64-x86_64-cc";
"x86_64-solaris" = "./Configure solaris64-x86_64-gcc";
"armv6l-linux" = "./Configure linux-armv4 -march=armv6";
"armv7l-linux" = "./Configure linux-armv4 -march=armv7-a";
}.${stdenv.hostPlatform.system} or (
if stdenv.hostPlatform == stdenv.buildPlatform
then "./config"