summaryrefslogtreecommitdiff
path: root/otp-0007-Add-extra-search-directory.patch
diff options
context:
space:
mode:
Diffstat (limited to 'otp-0007-Add-extra-search-directory.patch')
-rw-r--r--otp-0007-Add-extra-search-directory.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/otp-0007-Add-extra-search-directory.patch b/otp-0007-Add-extra-search-directory.patch
new file mode 100644
index 0000000..ed9e2ac
--- /dev/null
+++ b/otp-0007-Add-extra-search-directory.patch
@@ -0,0 +1,32 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Wed, 2 Aug 2017 16:12:19 +0300
+Subject: [PATCH] Add extra search directory
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl
+index 4c4823eb38..de0ab149fb 100644
+--- a/lib/kernel/src/code_server.erl
++++ b/lib/kernel/src/code_server.erl
+@@ -79,11 +79,17 @@ init(Ref, Parent, [Root,Mode]) ->
+ IPath =
+ case Mode of
+ interactive ->
+- LibDir = filename:append(Root, "lib"),
+- {ok,Dirs} = erl_prim_loader:list_dir(LibDir),
+- Paths = make_path(LibDir, Dirs),
++ F = fun(R) ->
++ LD = filename:append(R, "lib"),
++ case erl_prim_loader:list_dir(LD) of
++ error -> [];
++ {ok, D} -> make_path(LD, D)
++ end
++ end,
++ Paths = F(Root),
++ SharedPaths = F("/usr/share/erlang"),
+ UserLibPaths = get_user_lib_dirs(),
+- ["."] ++ UserLibPaths ++ Paths;
++ ["."] ++ UserLibPaths ++ Paths ++ SharedPaths;
+ _ ->
+ []
+ end,