diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-05-10 14:00:06 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-05-10 18:56:45 +0300 |
commit | 88143d96a06b4d83cdad4f6b66195c10640761b7 (patch) | |
tree | c0d02d0620059f609c4ae3d045153e7fab10e469 /openssl | |
parent | Use bundled OpenSSL when building for OS X 10.7 or later (diff) | |
download | core-88143d96a06b4d83cdad4f6b66195c10640761b7.tar.gz core-88143d96a06b4d83cdad4f6b66195c10640761b7.zip |
Attempt to clarify nested conditional mess
Change-Id: I2c174e23b3f995d819ff8ab72281b386b26c1cfe
Diffstat (limited to 'openssl')
-rw-r--r-- | openssl/ExternalProject_openssl.mk | 59 |
1 files changed, 40 insertions, 19 deletions
diff --git a/openssl/ExternalProject_openssl.mk b/openssl/ExternalProject_openssl.mk index 433d49402b3a..66373ba0fa3a 100644 --- a/openssl/ExternalProject_openssl.mk +++ b/openssl/ExternalProject_openssl.mk @@ -13,25 +13,46 @@ $(eval $(call gb_ExternalProject_register_targets,openssl,\ build \ )) -OPENSSL_PLATFORM := $(if $(filter LINUX FREEBSD ANDROID,$(OS)),\ - $(if $(filter I,$(CPU)),\ - $(if $(filter GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-i386,linux-elf),\ - $(if $(filter X,$(CPU)),\ - $(if $(filter GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-amd64,\ - $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic64, linux-generic64)),\ - $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic32, linux-generic32))),\ - $(if $(filter SOLARIS,$(OS)),\ - $(if $(filter INTEL,$(CPUNAME)),\ - $(if $(filter X,$(CPU)),\ - solaris64-x86_64-cc,solaris-x86-cc),\ - solaris-sparcv9-cc),\ - $(if $(filter IOS,$(OS)),\ - ios-armv7,\ - $(if $(filter WNT,$(OS)),\ - $(if $(filter GCC,$(COM)),\ - mingw,\ - $(if $(filter I,$(CPU)),\ - VC-WIN32,VC-WIN64A)))))) +# For multi-line conditionals, align the $(if and the corresponding ), +# putting the latter on a line of its own. Also put the "else" comma +# on a line of its own. Hopefully should make the logic more clear. + +OPENSSL_PLATFORM := \ + $(if $(filter LINUX FREEBSD ANDROID,$(OS)),\ + $(if $(filter I,$(CPU)),\ + $(if $(filter GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-i386,linux-elf)\ + ,\ + $(if $(filter X,$(CPU)),\ + $(if $(filter GNU/kFreeBSD,$(shell uname)),\ + debian-kfreebsd-amd64\ + ,\ + $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic64, linux-generic64)\ + )\ + ,\ + $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic32, linux-generic32)\ + )\ + )\ + ,\ + $(if $(filter SOLARIS,$(OS)),\ + $(if $(filter INTEL,$(CPUNAME)),\ + $(if $(filter X,$(CPU)),solaris64-x86_64-cc,solaris-x86-cc)\ + ,\ + solaris-sparcv9-cc\ + )\ + ,\ + $(if $(filter IOS,$(OS)),\ + ios-armv7\ + ,\ + $(if $(filter WNT,$(OS)),\ + $(if $(filter GCC,$(COM)),\ + mingw\ + ,\ + $(if $(filter I,$(CPU)),VC-WIN32,VC-WIN64A)\ + )\ + )\ + )\ + )\ + ) ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,openssl,build): |