diff options
| author | Rickard Green <[email protected]> | 2010-08-30 11:28:19 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2010-08-30 11:28:19 +0200 |
| commit | c4e5b4fe014cdfdddee8a37e2cee98677a6ec5ac (patch) | |
| tree | 1845b857d438783d20973d0789f16750978a4829 /lib/ssl/Makefile | |
| parent | 980773b6f40133feff45b0ad9e811174b85034d9 (diff) | |
| parent | 22fe8c9f870f5b20f1cb9e740ff20a15331472f9 (diff) | |
| download | otp-c4e5b4fe014cdfdddee8a37e2cee98677a6ec5ac.tar.gz otp-c4e5b4fe014cdfdddee8a37e2cee98677a6ec5ac.tar.bz2 otp-c4e5b4fe014cdfdddee8a37e2cee98677a6ec5ac.zip | |
Merge branch 'rickard/ssl-cross/OTP-8791' into dev
* rickard/ssl-cross/OTP-8791:
Fix SSL build failure when building in minimal source tree
Fix SSL build failure when building in minimal source tree
Diffstat (limited to 'lib/ssl/Makefile')
| -rw-r--r-- | lib/ssl/Makefile | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/lib/ssl/Makefile b/lib/ssl/Makefile index b8b51270c9..8c9d78d4bc 100644 --- a/lib/ssl/Makefile +++ b/lib/ssl/Makefile @@ -24,21 +24,11 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk # # Macros # -ifeq ($(findstring win32,$(TARGET)),win32) -ifeq ($(HOST_OS),) -HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) -endif -ifeq ($(findstring solaris,$(HOST_OS)),solaris) -SKIP_BUILDING_BINARIES := true -endif -else -SKIP_BUILDING_BINARIES := false -endif -ifeq ($(SKIP_BUILDING_BINARIES), true) SUB_DIRECTORIES = src c_src doc/src -else -SUB_DIRECTORIES = src c_src doc/src examples/certs examples/src + +ifeq ($(CROSS_COMPILING),no) +SUB_DIRECTORIES += examples/certs examples/src endif include vsn.mk |