diff options
author | Micael Karlberg <[email protected]> | 2011-09-23 16:13:43 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-09-23 16:13:43 +0200 |
commit | 1ead5e977d307ae391fdfd34e28fa5d587db2855 (patch) | |
tree | b5324d56ca67a1f427b876f03536d98025f31945 /lib/erl_interface/test/port_call_SUITE_data/Makefile.src | |
parent | 92657321ac647f343c6b88985d66a2d611fd982d (diff) | |
parent | 55bb3e1faf613c51ec59c9ee7ab4b4e967f30fda (diff) | |
download | otp-1ead5e977d307ae391fdfd34e28fa5d587db2855.tar.gz otp-1ead5e977d307ae391fdfd34e28fa5d587db2855.tar.bz2 otp-1ead5e977d307ae391fdfd34e28fa5d587db2855.zip |
Merge branch 'dev' into major
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/inets_app/inets.appup.src
lib/inets/test/httpc_cookie_SUITE.erl
lib/inets/vsn.mk
Diffstat (limited to 'lib/erl_interface/test/port_call_SUITE_data/Makefile.src')
-rw-r--r-- | lib/erl_interface/test/port_call_SUITE_data/Makefile.src | 2 |
1 files changed, 1 insertions, 1 deletions
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 |