Skip to content

Commit 27a378a

Browse files
authored
Merge pull request #2751 from BuckleScript/fix_bsb
fix raised by @bsansouci
2 parents 7e353ac + 401fdb1 commit 27a378a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

jscomp/bsb/bsb_ninja_gen.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,11 @@ let output_ninja_and_namespace_map
189189
let bs_groups = Array.init (number_of_dev_groups + 1 ) (fun i -> String_map.empty) in
190190
let source_dirs = Array.init (number_of_dev_groups + 1 ) (fun i -> []) in
191191
let static_resources =
192-
List.fold_left (fun acc_resources ({Bsb_parse_sources.sources; dir; resources; dir_index}) ->
192+
List.fold_left (fun (acc_resources : string list) ({Bsb_parse_sources.sources; dir; resources; dir_index}) ->
193193
let dir_index = (dir_index :> int) in
194194
bs_groups.(dir_index) <- merge_module_info_map bs_groups.(dir_index) sources ;
195195
source_dirs.(dir_index) <- dir :: source_dirs.(dir_index);
196-
Ext_list.map_append (fun x -> dir//x) resources resources
196+
Ext_list.map_append (fun x -> dir//x) resources acc_resources
197197
) [] bs_file_groups in
198198
let lib = bs_groups.((Bsb_dir_index.lib_dir_index :> int)) in
199199
has_reason_files := Bsb_db.sanity_check lib || !has_reason_files;

lib/bsb.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12566,7 +12566,7 @@ let output_ninja_and_namespace_map
1256612566
let bs_groups = Array.init (number_of_dev_groups + 1 ) (fun i -> String_map.empty) in
1256712567
let source_dirs = Array.init (number_of_dev_groups + 1 ) (fun i -> []) in
1256812568
let static_resources =
12569-
List.fold_left (fun acc_resources ({Bsb_parse_sources.sources; dir; resources; dir_index}) ->
12569+
List.fold_left (fun (acc_resources : string list) ({Bsb_parse_sources.sources; dir; resources; dir_index}) ->
1257012570
let dir_index = (dir_index :> int) in
1257112571
bs_groups.(dir_index) <- merge_module_info_map bs_groups.(dir_index) sources ;
1257212572
source_dirs.(dir_index) <- dir :: source_dirs.(dir_index);

0 commit comments

Comments
 (0)