Skip to content

Commit f937946

Browse files
authored
Add missing flambda2_datalog.cma to merge_archives (#3582)
* Add test for linking to ocamloptcomp * Add missing flambda2_datalog.cma to merge_archives
1 parent 67d5d3a commit f937946

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

dune

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -693,6 +693,7 @@
693693
%{dep:middle_end/flambda2/import/flambda2_import.a}
694694
%{dep:middle_end/flambda2/ui/flambda2_ui.a}
695695
%{dep:middle_end/flambda2/algorithms/flambda2_algorithms.a}
696+
%{dep:middle_end/flambda2/datalog/flambda2_datalog.a}
696697
%{dep:middle_end/flambda2/numbers/floats/flambda2_floats.a}
697698
%{dep:middle_end/flambda2/numbers/flambda2_numbers.a}
698699
%{dep:middle_end/flambda2/kinds/flambda2_kinds.a}
@@ -731,6 +732,7 @@
731732
%{dep:middle_end/flambda2/import/flambda2_import.cma}
732733
%{dep:middle_end/flambda2/ui/flambda2_ui.cma}
733734
%{dep:middle_end/flambda2/algorithms/flambda2_algorithms.cma}
735+
%{dep:middle_end/flambda2/datalog/flambda2_datalog.cma}
734736
%{dep:middle_end/flambda2/numbers/floats/flambda2_floats.cma}
735737
%{dep:middle_end/flambda2/numbers/flambda2_numbers.cma}
736738
%{dep:middle_end/flambda2/kinds/flambda2_kinds.cma}
@@ -769,6 +771,7 @@
769771
%{dep:middle_end/flambda2/import/flambda2_import.cmxa}
770772
%{dep:middle_end/flambda2/ui/flambda2_ui.cmxa}
771773
%{dep:middle_end/flambda2/algorithms/flambda2_algorithms.cmxa}
774+
%{dep:middle_end/flambda2/datalog/flambda2_datalog.cmxa}
772775
%{dep:middle_end/flambda2/numbers/floats/flambda2_floats.cmxa}
773776
%{dep:middle_end/flambda2/numbers/flambda2_numbers.cmxa}
774777
%{dep:middle_end/flambda2/kinds/flambda2_kinds.cmxa}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
(* TEST
2+
{
3+
setup-ocamlc.byte-build-env;
4+
module = "link_ocamloptcomp.ml";
5+
ocamlc.byte with ocamlcommon;
6+
module = "";
7+
flags = "-linkall";
8+
all_modules = "";
9+
program = "link_ocamloptcomp.cma";
10+
libraries += "ocamloptcomp";
11+
ocamlc.byte;
12+
check-ocamlc.byte-output;
13+
}{
14+
setup-ocamlopt.byte-build-env;
15+
module = "link_ocamloptcomp.ml";
16+
ocamlopt.byte with ocamlcommon;
17+
module = "";
18+
flags = "-linkall";
19+
all_modules = "";
20+
program = "link_ocamloptcomp.cmxa";
21+
libraries += "ocamloptcomp";
22+
ocamlopt.byte;
23+
check-ocamlopt.byte-output;
24+
}
25+
*)
26+
(* If this test fails, a new library likely needs to be added to the
27+
ocamloptcomp_with_flambda2 rules in the top-level dune file. *)

0 commit comments

Comments
 (0)