Skip to content

Commit a4eb634

Browse files
committed
tmp: search stdlib
1 parent e672a20 commit a4eb634

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

compiler/bsc/rescript_compiler_main.ml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,7 @@ let define_variable s =
185185
| _ -> Bsc_args.bad_arg ("illegal definition: " ^ s)
186186

187187
let print_standard_library () =
188-
let ( // ) = Filename.concat in
189-
let standard_library =
190-
Filename.dirname Sys.executable_name
191-
// Filename.parent_dir_name // "lib" // "ocaml"
192-
in
188+
let standard_library = Config.standard_library in
193189
print_string standard_library;
194190
print_newline ();
195191
exit 0

compiler/ext/config.ml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,15 @@ let version = "4.06.1+BS"
22

33
let standard_library =
44
let ( // ) = Filename.concat in
5-
Filename.dirname Sys.executable_name
6-
// Filename.parent_dir_name // "lib" // "ocaml"
5+
let exe_path = Sys.executable_name in
6+
if Ext_string.contain_substring exe_path "@rescript" then
7+
(* node_modules/@rescirpt/{platform}/bins *)
8+
Filename.dirname exe_path // Filename.parent_dir_name
9+
// Filename.parent_dir_name // Filename.parent_dir_name // "rescript"
10+
// "lib" // "ocaml"
11+
else
12+
(* node_modules/rescirpt/{platform} *)
13+
Filename.dirname exe_path // Filename.parent_dir_name // "lib" // "ocaml"
714

815
let standard_library_default = standard_library
916

0 commit comments

Comments
 (0)