aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2011-09-26 17:22:36 +0200
committerErlang/OTP <[email protected]>2011-09-26 17:22:36 +0200
commit9fce6b663d7183caaeed09cdb25d036d29c35215 (patch)
treebb8bd0acad9da39a49b4aef2072d59dbbb30f3a9 /lib
parentb98b8bdfde49de28c6c7b65f35930e5ad79eeea2 (diff)
parentedb449fc7f7ea9861b322edb6c00da907cec8c9c (diff)
downloadotp-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')
-rw-r--r--lib/crypto/Makefile1
-rw-r--r--lib/crypto/test/crypto_SUITE.erl11
2 files changed, 7 insertions, 5 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
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 283aadb6ea..10b1737a91 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -138,14 +138,15 @@ link_test_2(Drv) ->
Libs = os:cmd(Cmd),
io:format("~p\n", [Libs]),
case string:str(Libs, "libcrypto") of
- 0 -> ok;
- _ ->
+ 0 ->
case ?t:is_commercial() of
true ->
- ?t:fail({libcrypto,not_statically_linked});
+ ?t:fail({libcrypto,statically_linked});
false ->
- {comment,"Not statically linked (OK for open-source platform)"}
- end
+ {comment,"Statically linked (OK for open-source platform)"}
+ end;
+ _ ->
+ ok
end
end.