diff options
author | Erlang/OTP <[email protected]> | 2011-09-26 17:22:36 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2011-09-26 17:22:36 +0200 |
commit | 9fce6b663d7183caaeed09cdb25d036d29c35215 (patch) | |
tree | bb8bd0acad9da39a49b4aef2072d59dbbb30f3a9 /lib/crypto/Makefile | |
parent | b98b8bdfde49de28c6c7b65f35930e5ad79eeea2 (diff) | |
parent | edb449fc7f7ea9861b322edb6c00da907cec8c9c (diff) | |
download | otp-9fce6b663d7183caaeed09cdb25d036d29c35215.tar.gz otp-9fce6b663d7183caaeed09cdb25d036d29c35215.tar.bz2 otp-9fce6b663d7183caaeed09cdb25d036d29c35215.zip |
Merge branch 'sverker/remove-static-ssl-linking/OTP-9566' into maint-r14
* sverker/remove-static-ssl-linking/OTP-9566:
crypto: touch Makefile to provoke patch release
Change static link test of ssl to dynamic
Remove static ssl linking in crypto for otp_build
Diffstat (limited to 'lib/crypto/Makefile')
-rw-r--r-- | lib/crypto/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile index 13eebea6a9..2a8fc6acfd 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -36,3 +36,4 @@ SPECIAL_TARGETS = include $(ERL_TOP)/make/otp_subdir.mk +# touched by patch 1176 |