From c9585e55fdfc6f14604d52e243e03d7670308c29 Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Tue, 16 Jun 2026 08:52:51 +0100 Subject: [PATCH 1/2] Fix compilation of num for 4.x in museums --- Makefile.common | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Makefile.common b/Makefile.common index fe1782b..6425787 100644 --- a/Makefile.common +++ b/Makefile.common @@ -17,9 +17,18 @@ ifeq "$(NATIVE_COMPILER)" "" # $(NATIVE_COMPILER) was added in 4.09: use $(ARCH) for 4.06-4.08 ifeq "$(ARCH)" "none" NATIVE_COMPILER = false +NATDYNLINK = false else NATIVE_COMPILER = true endif +else +# OCaml 4.x only set's NATIVE_COMPILER = false when --disable-native-compiler is +# given explicitly. Legacy architectures not supported by the native compiler +# then end up with NATIVE_COMPILER=true and ARCH=none +ifeq "$(ARCH)" "none" +NATIVE_COMPILER = false +NATDYNLINK = false +endif endif # PROFILE=dev or PROFILE=release From a55f6bf2bddc9bc89a916ab27480f2c9fcddac35 Mon Sep 17 00:00:00 2001 From: Xavier Leroy Date: Fri, 19 Jun 2026 08:51:35 +0200 Subject: [PATCH 2/2] Typo --- Makefile.common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.common b/Makefile.common index 6425787..94e343a 100644 --- a/Makefile.common +++ b/Makefile.common @@ -22,7 +22,7 @@ else NATIVE_COMPILER = true endif else -# OCaml 4.x only set's NATIVE_COMPILER = false when --disable-native-compiler is +# OCaml 4.x only sets NATIVE_COMPILER = false when --disable-native-compiler is # given explicitly. Legacy architectures not supported by the native compiler # then end up with NATIVE_COMPILER=true and ARCH=none ifeq "$(ARCH)" "none"