diff --git a/Makefile b/Makefile index d0e04ef544c765463d893fdad267a1698fe12ae1..4acc04c9a4427428979dd4fbe84e52be8f57ef46 100644 --- a/Makefile +++ b/Makefile @@ -1536,11 +1536,8 @@ STDLIB_FILES:=\ stack \ string \ sys \ - weak - -ifeq ($(HAS_OCAML403),yes) - STDLIB_FILES+=ephemeron -endif + weak \ + ephemeron ifeq ($(HAS_OCAML407),no) STDLIB_FILES+=pervasives diff --git a/Makefile.generating b/Makefile.generating index ea525bf3630c865e6385d89d634fe30127e3dc91..12dd18b3f0afb4cb03bfaf8a9e8a9e682730a238 100644 --- a/Makefile.generating +++ b/Makefile.generating @@ -126,30 +126,6 @@ endif GENERATED+= src/libraries/utils/json.ml src/libraries/stdlib/transitioning.ml -ifeq ($(HAS_OCAML403),yes) - STACK_FOLD=Stack.fold -else - STACK_FOLD=stack_fold -endif - -ifeq ($(HAS_OCAML404),yes) - SPLIT_ON_CHAR=String.split_on_char -else - SPLIT_ON_CHAR=split_on_char -endif - -ifeq ($(HAS_OCAML405),yes) - NTH_OPT=List.nth_opt - FIND_OPT=List.find_opt - ASSOC_OPT=List.assoc_opt - ASSQ_OPT=List.assq_opt -else - NTH_OPT=nth_opt - FIND_OPT=find_opt - ASSOC_OPT=assoc_opt - ASSQ_OPT=assq_opt -endif - ifeq ($(HAS_OCAML408),yes) DYNLINK_INIT=fun () -> () FORMAT_STAG=stag diff --git a/configure.in b/configure.in index bb2c1b978c80f3df0a79521b956367dff13f9442..aeb14b7922d7e3d83280cdd0252d81cf3284efb3 100644 --- a/configure.in +++ b/configure.in @@ -117,9 +117,6 @@ AC_SUBST(OCAMLMAJORNB) AC_SUBST(OCAMLMINORNB) AC_SUBST(OCAMLPATCHNB) -AC_SUBST(HAS_OCAML403) -AC_SUBST(HAS_OCAML404) -AC_SUBST(HAS_OCAML405) AC_SUBST(HAS_OCAML407) AC_SUBST(HAS_OCAML408) @@ -128,15 +125,9 @@ OCAMLMINORNB=$(echo $OCAMLVERSION | cut -f 2 -d .) OCAMLPATCHNB=$(echo $OCAMLVERSION | cut -f 3 -d .) if test $OCAMLMAJORNB -gt 4; then - HAS_OCAML403=yes; - HAS_OCAML404=yes; - HAS_OCAML405=yes; HAS_OCAML407=yes; HAS_OCAML408=yes; else - HAS_OCAML403=yes; - HAS_OCAML404=yes; - HAS_OCAML405=yes; HAS_OCAML407=no; HAS_OCAML408=no; if test $OCAMLMINORNB -ge 7; then diff --git a/share/Makefile.config.in b/share/Makefile.config.in index f0bc8ae518d5973c1e46e30e979ecf6e1dcdfd73..6acbd529f84b1977739ae8f79aaf3fb24ee47caa 100644 --- a/share/Makefile.config.in +++ b/share/Makefile.config.in @@ -85,9 +85,6 @@ OCAMLMAJORNB ?=@OCAMLMAJORNB@ OCAMLMINORNB ?=@OCAMLMINORNB@ OCAMLPATCHNB ?=@OCAMLPATCHNB@ -HAS_OCAML403 ?=@HAS_OCAML403@ -HAS_OCAML404 ?=@HAS_OCAML404@ -HAS_OCAML405 ?=@HAS_OCAML405@ HAS_OCAML407 ?=@HAS_OCAML407@ HAS_OCAML408 ?=@HAS_OCAML408@ diff --git a/share/Makefile.plugin.template b/share/Makefile.plugin.template index d9be7dfb47901441f0af3e63a90546f2722bdf26..63edcb5cf609d4cde8a433a6e66045459f70afbb 100644 --- a/share/Makefile.plugin.template +++ b/share/Makefile.plugin.template @@ -553,12 +553,7 @@ endif # PLUGIN_HAS_META @PLUGIN_NAME@_PLUGIN_MLI:= $(PLUGIN_DIR)/@PLUGIN_NAME@.mli @PLUGIN_NAME@_CHECK_PLUGIN_MLI:=$(PLUGIN_DIR)/@PLUGIN_NAME@.check_mli_exists -# Prevents warning 58 in OCaml 4.03 for our plugins. -ifeq ($(HAS_OCAML403),yes) - $(TARGET_CMI): BFLAGS:=$($(NAME_BFLAGS)) -opaque -else - $(TARGET_CMI): BFLAGS:=$($(NAME_BFLAGS)) -endif +$(TARGET_CMI): BFLAGS:=$($(NAME_BFLAGS)) -opaque $(TARGET_CMI): $(PLUGIN_CMO)