Call ./configure with --disable-native-compiler on bytecode

diff --git a/debian/changelog b/debian/changelog
index 74efcacbbc9c595c2e863a2688c70d4c2cafb15e..af6254003e924feac2036cdd930e8b9556586d37 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml (4.11.1-2) UNRELEASED; urgency=medium
+
+  * Call ./configure with --disable-native-compiler on all bytecode
+    architectures
+
+ -- Stéphane Glondu <glondu@debian.org>  Fri, 04 Sep 2020 15:30:36 +0200
+
 ocaml (4.11.1-1) experimental; urgency=medium
 
   * New upstream release

diff --git a/debian/rules b/debian/rules
index 5f92738db3187b3b494fabb609c2258ea6305f93..2817a391bafc24fe6e8538083ed40cd1e6d306c5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -63,7 +63,7 @@ CONFIGURE_OPTS := \
 # Upstream recommends dropping support on armel, see https://github.com/ocaml/ocaml/issues/7642
 # Binaries generated by ocamlopt segfault on x32
 # ld reports spurious messages on powerpc, see https://github.com/ocaml/ocaml/issues/8846
-ifneq (,$(filter $(DEB_HOST_ARCH),armel powerpc x32))
+ifeq (,$(OCAML_OPT_ARCH))
 CONFIGURE_OPTS += --disable-native-compiler
 endif