diff options
| author | Rickard Green <[email protected]> | 2019-01-24 17:52:31 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-01-24 17:52:31 +0100 |
| commit | 49eb25c80514b1e221cc516c423bbc45ba7cc107 (patch) | |
| tree | 0d013d9a82099019e47a20804caa4675ab0b7734 /lib/common_test | |
| parent | 3d909edaadcc13d42698f815662188ff35eab90a (diff) | |
| parent | 1ff44ec786828c3eeb2114cfeb5dd47e1a7fae61 (diff) | |
| download | otp-49eb25c80514b1e221cc516c423bbc45ba7cc107.tar.gz otp-49eb25c80514b1e221cc516c423bbc45ba7cc107.tar.bz2 otp-49eb25c80514b1e221cc516c423bbc45ba7cc107.zip | |
Merge branch 'maint'
* maint:
Pluggable distribution socket implementation for EI
Diffstat (limited to 'lib/common_test')
| -rw-r--r-- | lib/common_test/test_server/ts_erl_config.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/common_test/test_server/ts_erl_config.erl b/lib/common_test/test_server/ts_erl_config.erl index 537628e39a..f3972bea4e 100644 --- a/lib/common_test/test_server/ts_erl_config.erl +++ b/lib/common_test/test_server/ts_erl_config.erl @@ -208,7 +208,11 @@ erl_interface(Vars,OsType) -> {filename:join(Dir, "lib"), filename:join([Dir, "src", "eidefs.mk"])}; {srctree, _Root, Target} -> - {filename:join([Dir, "obj", 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} end, |