Skip to content

Commit 735d43b

Browse files
committed
remove bs_dep as parameter
1 parent 9b1b4be commit 735d43b

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

jscomp/bsb/bsb_ninja_gen.ml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ let output_ninja_and_namespace_map
180180
let warnings = Bsb_warning.to_bsb_string ~package_kind warning in
181181
let bsc_flags = (get_bsc_flags bsc_flags) in
182182
let bsc_path = (Ext_filename.maybe_quote Bsb_global_paths.vendor_bsc) in
183-
let bs_dep = (Ext_filename.maybe_quote Bsb_global_paths.vendor_bsdep) in
184183
let dpkg_incls = (Bsb_build_util.include_dirs_by
185184
bs_dev_dependencies
186185
(fun x -> x.package_install_path)) in
@@ -229,8 +228,7 @@ let output_ninja_and_namespace_map
229228
~digest
230229
~package_name
231230
~bsc:bsc_path
232-
~warnings
233-
~bs_dep
231+
~warnings
234232
~ppx_files
235233
~bsc_flags
236234
~dpkg_incls (* dev dependencies *)

jscomp/bsb/bsb_ninja_rule.ml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,16 @@ let make_custom_rules
124124
~(namespace : string option)
125125
~package_name
126126
~bsc
127-
~warnings
128-
~(bs_dep : string)
127+
~warnings
129128
~(ppx_files : Bsb_config_types.ppx list)
130129
~bsc_flags
131130
~(dpkg_incls : string)
132131
~(lib_incls : string)
133132
~(dev_incls : string)
134133
(custom_rules : command Map_string.t) :
135134
builtin =
135+
let bs_dep = Ext_filename.maybe_quote Bsb_global_paths.vendor_bsdep in
136+
136137
(** FIXME: We don't need set [-o ${out}] when building ast
137138
since the default is already good -- it does not*)
138139
let buf = Ext_buffer.create 100 in

jscomp/bsb/bsb_ninja_rule.mli

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ val make_custom_rules :
8181
package_name:string ->
8282
bsc:string ->
8383
warnings:string ->
84-
bs_dep:string ->
8584
ppx_files:Bsb_config_types.ppx list ->
8685
bsc_flags:string ->
8786
dpkg_incls:string ->

lib/4.06.1/bsb.ml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12743,7 +12743,6 @@ val make_custom_rules :
1274312743
package_name:string ->
1274412744
bsc:string ->
1274512745
warnings:string ->
12746-
bs_dep:string ->
1274712746
ppx_files:Bsb_config_types.ppx list ->
1274812747
bsc_flags:string ->
1274912748
dpkg_incls:string ->
@@ -12881,15 +12880,16 @@ let make_custom_rules
1288112880
~(namespace : string option)
1288212881
~package_name
1288312882
~bsc
12884-
~warnings
12885-
~(bs_dep : string)
12883+
~warnings
1288612884
~(ppx_files : Bsb_config_types.ppx list)
1288712885
~bsc_flags
1288812886
~(dpkg_incls : string)
1288912887
~(lib_incls : string)
1289012888
~(dev_incls : string)
1289112889
(custom_rules : command Map_string.t) :
1289212890
builtin =
12891+
let bs_dep = Ext_filename.maybe_quote Bsb_global_paths.vendor_bsdep in
12892+
1289312893
(** FIXME: We don't need set [-o ${out}] when building ast
1289412894
since the default is already good -- it does not*)
1289512895
let buf = Ext_buffer.create 100 in
@@ -13683,7 +13683,6 @@ let output_ninja_and_namespace_map
1368313683
let warnings = Bsb_warning.to_bsb_string ~package_kind warning in
1368413684
let bsc_flags = (get_bsc_flags bsc_flags) in
1368513685
let bsc_path = (Ext_filename.maybe_quote Bsb_global_paths.vendor_bsc) in
13686-
let bs_dep = (Ext_filename.maybe_quote Bsb_global_paths.vendor_bsdep) in
1368713686
let dpkg_incls = (Bsb_build_util.include_dirs_by
1368813687
bs_dev_dependencies
1368913688
(fun x -> x.package_install_path)) in
@@ -13732,8 +13731,7 @@ let output_ninja_and_namespace_map
1373213731
~digest
1373313732
~package_name
1373413733
~bsc:bsc_path
13735-
~warnings
13736-
~bs_dep
13734+
~warnings
1373713735
~ppx_files
1373813736
~bsc_flags
1373913737
~dpkg_incls (* dev dependencies *)

0 commit comments

Comments
 (0)