From: Stephane Glondu <steph@glondu.net>
Date: Tue, 21 Feb 2012 15:28:18 +0100
Subject: Fix tests on bytecode-only architectures

---
 testsuite/lib/Makefile              |    4 +++-
 testsuite/makefiles/Makefile.common |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/testsuite/lib/Makefile b/testsuite/lib/Makefile
index c73bea5..904025f 100644
--- a/testsuite/lib/Makefile
+++ b/testsuite/lib/Makefile
@@ -1,9 +1,11 @@
 # $Id$
 
-compile: testing.cmi testing.cmo testing.cmx
+compile: compile-targets
 
 promote: defaultpromote
 
 clean: defaultclean
 
 include ../makefiles/Makefile.common
+
+compile-targets: testing.cmi testing.cmo $(if $(BYTECODE_ONLY),,testing.cmx)
diff --git a/testsuite/makefiles/Makefile.common b/testsuite/makefiles/Makefile.common
index e1b15db..f66cef2 100644
--- a/testsuite/makefiles/Makefile.common
+++ b/testsuite/makefiles/Makefile.common
@@ -16,7 +16,7 @@ OCAMLMKLIB=$(OCAMLRUN) $(TOPDIR)/tools/ocamlmklib$(EXE)
 OCAMLYACC=$(TOPDIR)/yacc/ocamlyacc$(EXE)
 OCAMLBUILD=$(TOPDIR)/_build/ocamlbuild/ocamlbuild.native
 DUMPOBJ=$(OCAMLRUN) $(TOPDIR)/tool/dumpobj$(EXE)
-BYTECODE_ONLY=`if [ "$(ASM)" = "none" ]; then echo 'YES'; else echo ''; fi`
+BYTECODE_ONLY=`if [ "$(ARCH)" = "none" ]; then echo 'YES'; else echo ''; fi`
 #COMPFLAGS=
 #FORTRAN_COMPILER=
 #FORTRAN_LIBRARY=
--