Merge tag 'v0.22.11'

release v0.22.11
2021-08-24 22:19:38 +02:00
parent 34aa67ea87 94c196108d
commit 8a29805767
19 changed files with 330 additions and 137 deletions
--- a/python/build/openssl.py
+++ b/python/build/openssl.py
@ -48,7 +48,6 @@ class OpenSSLProject(MakeProject):
        }

        openssl_arch = openssl_archs[toolchain.arch]
-        cross_compile_prefix = toolchain.toolchain_arch + '-'

        subprocess.check_call(['./Configure',
                               'no-shared',
@ -57,7 +56,6 @@ class OpenSSLProject(MakeProject):
                               'no-tests',
                               'no-asm', # "asm" causes build failures on Windows
                               openssl_arch,
-                               '--cross-compile-prefix=' + cross_compile_prefix,
                               '--prefix=' + toolchain.install_prefix],
                              cwd=src, env=toolchain.env)
        MakeProject.build(self, toolchain, src)