aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2011-09-23 15:12:49 +0200
committerBjörn-Egil Dahlberg <[email protected]>2011-09-23 15:12:49 +0200
commit55bb3e1faf613c51ec59c9ee7ab4b4e967f30fda (patch)
treeb22a63ba9d1ae4ceef600916b41f5486a361e30d /lib
parent12f3b441fc138a6e7a5bc09b8973bd55cba8b5be (diff)
parent3a490638107f1fc559d1392920ace6553a3a17dd (diff)
downloadotp-55bb3e1faf613c51ec59c9ee7ab4b4e967f30fda.tar.gz
otp-55bb3e1faf613c51ec59c9ee7ab4b4e967f30fda.tar.bz2
otp-55bb3e1faf613c51ec59c9ee7ab4b4e967f30fda.zip
Merge branch 'egil/fix-ei-cover-case' into dev
* egil/fix-ei-cover-case: ei: Add gcc link flags to port_call_SUITE 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/test/crypto_SUITE.erl11
-rw-r--r--lib/erl_interface/test/port_call_SUITE_data/Makefile.src2
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 2fa058c852..26d10d892a 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.
diff --git a/lib/erl_interface/test/port_call_SUITE_data/Makefile.src b/lib/erl_interface/test/port_call_SUITE_data/Makefile.src
index dc7385ba32..0799187d64 100644
--- a/lib/erl_interface/test/port_call_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/port_call_SUITE_data/Makefile.src
@@ -26,7 +26,7 @@ LIBPATH = @erl_interface_libpath@
LIBERL = $(LIBPATH)/@erl_interface_lib_drv@
LIBEI = $(LIBPATH)/@erl_interface_eilib_drv@
-SHLIB_EXTRA_LDLIBS = $(LIBERL) $(LIBEI)
+SHLIB_EXTRA_LDLIBS = $(LIBERL) $(LIBEI) @erl_interface_threadlib@
SHLIB_EXTRA_CFLAGS = -I@erl_interface_include@ -I../all_SUITE_data