aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2019-02-25 11:20:52 +0100
committerRickard Green <[email protected]>2019-02-25 11:20:52 +0100
commit5045fe8660545754ab5ec6bb3cbcf3a8ff7d9697 (patch)
tree6073545f9b4a579e3299b0d36f9aeacfc4d0d64b /lib/common_test
parent2c06e174d6515b6a842906de9e6ebc70bd2f2ec0 (diff)
parent00fa7a8def826d2a4c8fb9e2c38208103bf04341 (diff)
downloadotp-5045fe8660545754ab5ec6bb3cbcf3a8ff7d9697.tar.gz
otp-5045fe8660545754ab5ec6bb3cbcf3a8ff7d9697.tar.bz2
otp-5045fe8660545754ab5ec6bb3cbcf3a8ff7d9697.zip
Merge branch 'rickard/deprecations-removals'
OTP-15621 OTP-15622 * rickard/deprecations-removals: Document deprecations and removals
Diffstat (limited to 'lib/common_test')
-rw-r--r--lib/common_test/test_server/ts_erl_config.erl36
1 files changed, 22 insertions, 14 deletions
diff --git a/lib/common_test/test_server/ts_erl_config.erl b/lib/common_test/test_server/ts_erl_config.erl
index f3972bea4e..c2852131d6 100644
--- a/lib/common_test/test_server/ts_erl_config.erl
+++ b/lib/common_test/test_server/ts_erl_config.erl
@@ -197,24 +197,28 @@ system_include(Root, Vars) ->
" -I" ++ quote(filename:nativename(filename:join([Root, "erts", "emulator", SysDir]))).
erl_interface(Vars,OsType) ->
- {Incl, {LibPath, MkIncl}} =
+ {Incl, TargetIncl, {LibPath, MkIncl}} =
case lib_dir(Vars, erl_interface) of
{error, bad_name} ->
throw({cannot_find_app, erl_interface});
Dir ->
- {filename:join(Dir, "include"),
- case erl_root(Vars) of
- {installed, _Root} ->
- {filename:join(Dir, "lib"),
- filename:join([Dir, "src", "eidefs.mk"])};
- {srctree, _Root, Target} ->
- Obj = case is_debug_build() of
- true -> "obj.debug";
- false -> "obj"
- end,
- {filename:join([Dir, Obj, Target]),
- filename:join([Dir, "src", Target, "eidefs.mk"])}
- end}
+ BaseIncl = filename:join(Dir, "include"),
+ case erl_root(Vars) of
+ {installed, _Root} ->
+ {BaseIncl,
+ [],
+ {filename:join(Dir, "lib"),
+ filename:join([Dir, "src", "eidefs.mk"])}};
+ {srctree, _Root, Target} ->
+ Obj = case is_debug_build() of
+ true -> "obj.debug";
+ false -> "obj"
+ end,
+ {BaseIncl,
+ filename:join(BaseIncl, Target),
+ {filename:join([Dir, Obj, Target]),
+ filename:join([Dir, "src", Target, "eidefs.mk"])}}
+ end
end,
Lib = link_library("erl_interface",OsType),
Lib1 = link_library("ei",OsType),
@@ -260,6 +264,10 @@ erl_interface(Vars,OsType) ->
{erl_interface_eilib_drv, quote(filename:join(LibPath, Lib1Drv))},
{erl_interface_threadlib, ThreadLib},
{erl_interface_include, quote(filename:nativename(Incl))},
+ {erl_interface_target_include, case TargetIncl of
+ [] -> [];
+ _ -> "-I" ++ quote(filename:nativename(TargetIncl))
+ end},
{erl_interface_mk_include, quote(filename:nativename(MkIncl))}
| Vars].