ocaml-flambda
diff --git a/‎Makefile.common-jst
+22 b/‎Makefile.common-jst
+22
diff --git a/‎backend/cmm.ml
+4-4 b/‎backend/cmm.ml
+4-4
@@ -440,3 +440,25 @@ debug-printers: runtime-stdlib # required for $(ws_main) to work
 	@echo
 	@echo To load into ocamldebug, use:
 	@echo source \"$$(realpath _build/main/$(ocamldir)/tools/debug_printers)\"
+
+
+.PHONY: boot-install
+boot-install: runtime-stdlib
+	rm -rf _install
+	mkdir -p _install/{bin,lib/ocaml}
+	$(cpl) _build/runtime_stdlib_install/bin/* _install/bin/
+	$(cpl) _build/_bootinstall/bin/* _install/bin/
+	$(cpl) -R _build/runtime_stdlib_install/lib/ocaml_runtime_stdlib/* \
+    _install/lib/ocaml/
+	rm -f _install/lib/ocaml/{META,dune-package,Makefile.config,dynlink.cmxa}
+	$(cpl) -R _build/_bootinstall/lib/ocaml/* _install/lib/ocaml/
+	rm -f _install/lib/ocaml/{META,dune-package}
+	rm -f _install/lib/ocaml/compiler-libs/*.cmo
+	mkdir _install/lib/stublibs
+	find _build/default -name "dll*.so" \
+          -exec cp -f -t _install/lib/stublibs {} \+
+	mkdir -p _install/lib/ocaml/compiler-libs
+	cp _build/default/parser.cmly _install/lib/ocaml/compiler-libs/
+	find _build/default/ \( -name "flambda2*.cmi" \
+          -or -name "flambda2*.cmti" -or -name "flambda2*.cmt" \) \
+          -exec cp -f -t _install/lib/ocaml/compiler-libs {} \+
@@ -132,18 +132,18 @@ let machtype_of_exttype_list xtl =
 type integer_comparison = Lambda.integer_comparison =
   | Ceq | Cne | Clt | Cgt | Cle | Cge
 
-let negate_integer_comparison = Lambda.negate_integer_comparison
+let negate_integer_comparison = Scalar.Integer_comparison.negate
 
-let swap_integer_comparison = Lambda.swap_integer_comparison
+let swap_integer_comparison = Scalar.Integer_comparison.swap
 
 (* With floats [not (x < y)] is not the same as [x >= y] due to NaNs,
    so we provide additional comparisons to represent the negations.*)
 type float_comparison = Lambda.float_comparison =
   | CFeq | CFneq | CFlt | CFnlt | CFgt | CFngt | CFle | CFnle | CFge | CFnge
 
-let negate_float_comparison = Lambda.negate_float_comparison
+let negate_float_comparison = Scalar.Float_comparison.negate
 
-let swap_float_comparison = Lambda.swap_float_comparison
+let swap_float_comparison = Scalar.Float_comparison.swap
 
 type label = Label.t