diff options
| author | Rickard Green <[email protected]> | 2019-01-24 17:51:08 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-01-24 17:51:08 +0100 |
| commit | 1ff44ec786828c3eeb2114cfeb5dd47e1a7fae61 (patch) | |
| tree | d4bcae227e9aa7e56edfe84c4c58b253510b2773 /lib/common_test | |
| parent | a4aeacd28e4e31d3d79b091afcdc528082be2865 (diff) | |
| parent | a4641c5b3469d2e3cb9b0937ed941748fbbf2036 (diff) | |
| download | otp-1ff44ec786828c3eeb2114cfeb5dd47e1a7fae61.tar.gz otp-1ff44ec786828c3eeb2114cfeb5dd47e1a7fae61.tar.bz2 otp-1ff44ec786828c3eeb2114cfeb5dd47e1a7fae61.zip | |
Merge branch 'rickard/ei-ext-maint/OTP-15442' into maint
* rickard/ei-ext-maint/OTP-15442:
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, |