This fixes breakage encountered when doing 'make test' on x86-64.

Signed-off-by: Eduard - Gabriel Munteanu <eduard.munte...@linux360.ro>
---
 scripts/build/test.mk |    4 +++-
 test/jit/Makefile     |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/build/test.mk b/scripts/build/test.mk
index bbfc279..8861641 100644
--- a/scripts/build/test.mk
+++ b/scripts/build/test.mk
@@ -4,7 +4,9 @@ DEFAULT_CFLAGS  ?= -rdynamic -g -Wall -Wundef -Wsign-compare 
-Os -std=gnu99 -D_GN
 # XXX: Temporary hack -Vegard
 DEFAULT_CFLAGS += -DNOT_IMPLEMENTED='fprintf(stderr, "%s:%d: warning: %s not 
implemented\n", __FILE__, __LINE__, __func__)'
 
-INCLUDE                ?= -I../include/ -I. -I../libharness -I../../include 
-I../../jit/glib -I../../cafebabe/include/ -include $(ARCH_CONFIG)
+INCLUDE                ?= -I../include/ -I. -I../libharness -I../../include \
+                  -I../../jit/glib -I../../cafebabe/include/ \
+                  -I../../arch/$(ARCH)/include -include $(ARCH_CONFIG)
 DEFAULT_LIBS   ?= -lrt -lpthread -lm -ldl -lz -lbfd -lopcodes -liberty
 
 ifdef TESTS
diff --git a/test/jit/Makefile b/test/jit/Makefile
index 25a0966..2912903 100644
--- a/test/jit/Makefile
+++ b/test/jit/Makefile
@@ -96,6 +96,6 @@ TEST_OBJS := \
        tree-printer-test.o \
        typeconv-bc-test.o
 
-CFLAGS += -I ../../arch/mmix/include
+DEFAULT_CFLAGS += -I../../arch/mmix/include -std=gnu99
 
 include ../../scripts/build/test.mk
-- 
1.6.0.6


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Jatovm-devel mailing list
Jatovm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jatovm-devel

Reply via email to