Skip to content

Commit 7a645ae

Browse files
committed
remove common shadows
todo: remove postbuild shadows
1 parent 67af904 commit 7a645ae

File tree

1 file changed

+6
-24
lines changed

1 file changed

+6
-24
lines changed

jscomp/bsb/bsb_ninja_file_groups.ml

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,7 @@ let handle_generators oc
4646
)
4747

4848

49-
let make_common_shadows
50-
package_specs
51-
dirname
52-
: Bsb_ninja_targets.shadow list
53-
=
54-
55-
[{ key = Bsb_ninja_global_vars.g_pkg_flg;
56-
op =
57-
Append
58-
(Bsb_package_specs.package_flag_of_package_specs
59-
package_specs dirname
60-
)
61-
}]
62-
49+
6350

6451
type suffixes = {
6552
impl : string;
@@ -117,10 +104,6 @@ let emit_module_build
117104
let output_cmj = output_filename_sans_extension ^ Literals.suffix_cmj in
118105
let output_js =
119106
Bsb_package_specs.get_list_of_output_js package_specs output_filename_sans_extension in
120-
let common_shadows =
121-
make_common_shadows package_specs
122-
(Filename.dirname output_cmi)
123-
in
124107

125108
Bsb_ninja_targets.output_build oc
126109
~outputs:[output_mlast]
@@ -143,20 +126,19 @@ let emit_module_build
143126
;
144127
Bsb_ninja_targets.output_build oc
145128
~outputs:[output_cmi]
146-
~shadows:common_shadows
147129
~order_only_deps:[output_d]
148130
~inputs:[output_mliast]
149131
~rule:(if is_dev then rules.mi_dev else rules.mi)
150132
;
151133
end;
152134

153-
let shadows =
135+
let shadows : Bsb_ninja_targets.shadow list =
154136
match js_post_build_cmd with
155-
| None -> common_shadows
137+
| None -> []
156138
| Some cmd ->
157-
{key = Bsb_ninja_global_vars.postbuild;
158-
op = Overwrite ("&& " ^ cmd ^ Ext_string.single_space ^ String.concat Ext_string.single_space output_js)}
159-
:: common_shadows
139+
[{key = Bsb_ninja_global_vars.postbuild;
140+
op = Overwrite ("&& " ^ cmd ^ Ext_string.single_space ^ String.concat Ext_string.single_space output_js)}]
141+
160142
in
161143
let rule =
162144
if has_intf_file then

0 commit comments

Comments
 (0)