From a4caaef4df6acbdd7c46962004edc1d47504bbf4 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Thu, 7 Mar 2019 15:53:19 +0100
Subject: Better erl_interface deprecation warning implementation

---
 lib/common_test/test_server/ts_erl_config.erl | 36 +++++++++++----------------
 1 file changed, 14 insertions(+), 22 deletions(-)

(limited to 'lib/common_test/test_server')

diff --git a/lib/common_test/test_server/ts_erl_config.erl b/lib/common_test/test_server/ts_erl_config.erl
index c2852131d6..f3972bea4e 100644
--- a/lib/common_test/test_server/ts_erl_config.erl
+++ b/lib/common_test/test_server/ts_erl_config.erl
@@ -197,28 +197,24 @@ system_include(Root, Vars) ->
     " -I" ++ quote(filename:nativename(filename:join([Root, "erts", "emulator", SysDir]))).
 
 erl_interface(Vars,OsType) ->
-    {Incl, TargetIncl, {LibPath, MkIncl}} =
+    {Incl, {LibPath, MkIncl}} =
 	case lib_dir(Vars, erl_interface) of
 	    {error, bad_name} ->
 		throw({cannot_find_app, erl_interface});
 	    Dir ->
-                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
+		{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}
 	end,
     Lib = link_library("erl_interface",OsType),
     Lib1 = link_library("ei",OsType),
@@ -264,10 +260,6 @@ 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].
 
-- 
cgit v1.2.3