diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2013-04-19 15:54:00 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2013-04-19 16:32:38 +0200 |
| commit | e7b2b505951d888d8b2337df991bd584090c9384 (patch) | |
| tree | 0d9b17a4b258932ad9f5bb1dd57ddcb2d14b98c8 /openssl | |
| parent | 0fcc1968daa6b6c877a3c17cc800b47d82c8a10f (diff) | |
Fix https://-related crashes.
The internal openssl on 64bit linux was built as linux-generic32, instead of
linux-generi64, which caused crashes later when used. This patch alignes it
with the logic before gbuildization.
Change-Id: I2919a91138e8f33ad50e64728496144bac815321
Diffstat (limited to 'openssl')
| -rw-r--r-- | openssl/ExternalProject_openssl.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/openssl/ExternalProject_openssl.mk b/openssl/ExternalProject_openssl.mk index aa5492f3da32..97cd10fcbfd2 100644 --- a/openssl/ExternalProject_openssl.mk +++ b/openssl/ExternalProject_openssl.mk @@ -17,9 +17,10 @@ $(eval $(call gb_ExternalProject_register_targets,openssl,\ OPENSSL_PLATFORM := $(if $(filter LINUX FREEBSD ANDROID,$(OS)),\ $(if $(filter I,$(CPU)),\ - $(if $(filter GNU/kFreeBSD,$(shell uname)),\ - debian-kfreebsd-i386,linux-elf),\ - linux-generic32),\ + $(if $(filter GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-i386,linux-elf),\ + $(if $(filter X,$(CPU)),\ + $(if $(filter GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-amd64,linux-generic64),\ + linux-generic32)),\ $(if $(filter SOLARIS,$(OS)),\ $(if $(filter INTEL,$(CPUNAME)),\ $(if $(filter X,$(CPU)),\ |