From c630a6b7a4696de8875e51d6b05d6b0ca195b81b Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Tue, 27 Mar 2012 15:35:17 +0200 Subject: [PATCH] Fix embedded test broken by our -custom behaviour --- ...ytecode-in-C-object-when-using-custom.patch | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch b/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch index c062dcfe..aedb4436 100644 --- a/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch +++ b/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch @@ -11,8 +11,9 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=256900 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627761 Signed-off-by: Stephane Glondu --- - bytecomp/bytelink.ml | 36 ++++++++++++++++++++++++++++++++---- - 1 files changed, 32 insertions(+), 4 deletions(-) + bytecomp/bytelink.ml | 36 ++++++++++++++++++++++++++++++++---- + testsuite/tests/embedded/Makefile | 3 +++ + 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml index 8f797a1..1de0a79 100644 @@ -95,4 +96,17 @@ index 8f797a1..1de0a79 100644 if not (Filename.check_suffix output_name ".c") then begin temps := c_file :: !temps; if Ccomp.compile_file c_file <> 0 then raise(Error Custom_runtime); +diff --git a/testsuite/tests/embedded/Makefile b/testsuite/tests/embedded/Makefile +index ed33143..0d1e4ca 100644 +--- a/testsuite/tests/embedded/Makefile ++++ b/testsuite/tests/embedded/Makefile +@@ -1,5 +1,8 @@ + BASEDIR=../.. + ++# This test relies on the upstream behaviour of -custom ++export OCAML_COMPAT=c ++ + default: compile run + + compile: -- -- 2.30.2