Merge pull request #226 from ocsigen/fix

Fix module linking order with OCaml 5
ocsigen · Oct 7, 2023 · 7342cea · 7342cea
2 parents 9e6e3d4 + 2296e48
commit 7342cea
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -46,12 +46,7 @@ opt:: $(LIBDIR)/${PKG_NAME}.server.cmxs
 ##----------------------------------------------------------------------
 ## Aux
 
-# Use `eliomdep -sort' only in OCaml>4
-ifeq ($(shell ocamlc -version|cut -c1),4)
 eliomdep=$(shell $(ELIOMDEP) $(1) -ppx -sort $(2) $(filter %.eliom %.ml,$(3))))
-else
-eliomdep=$(3)
-endif
 objs=$(patsubst %.ml,$(1)/%.$(2),$(patsubst %.eliom,$(1)/%.$(2),$(filter %.eliom %.ml,$(3))))
 depsort=$(call objs,$(1),$(2),$(call eliomdep,$(3),$(4),$(5)))
 

diff --git a/opam b/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ocsigen-toolkit"
-version: "3.3.1"
+version: "3.3.2"
 maintainer: "[email protected]"
 synopsis: "Reusable UI components for Eliom applications (client only, or client-server)"
 description: "The Ocsigen Toolkit is a set of user interface widgets that facilitate the development of Eliom applications."