* support/regression/Makefile.in,

[fw/sdcc] / support / regression / ports / ucz80 / spec.mk

diff --git a/support/regression/ports/ucz80/spec.mk b/support/regression/ports/ucz80/spec.mk
index 1ea814a7b5cb260811743cb75cbd3ea94c0fc3b6..2189e2f740997d326694aa732948d93e7c07f3c2 100644 (file)
--- a/support/regression/ports/ucz80/spec.mk
+++ b/support/regression/ports/ucz80/spec.mk
@@ -1,18 +1,26 @@
-# Port specification for the xxxx port running with uCsim
+# Regression test specification for the z80 target running with uCsim
 #
 
 # path to uCsim
-# path to uCsim
-SZ80A = $(top_builddir)sim/ucsim/z80.src/sz80
-SZ80B = $(top_builddir)bin/sz80
+ifdef SDCC_BIN_PATH
+  UCZ80 = $(SDCC_BIN_PATH)/sz80
+
+  AS_Z80 = $(SDCC_BIN_PATH)/as-z80
+else
+  SZ80A = $(top_builddir)/sim/ucsim/z80.src/sz80
+  SZ80B = $(top_builddir)/bin/sz80
+
+  UCZ80 = $(shell if [ -f $(SZ80A) ]; then echo $(SZ80A); else echo $(SZ80B); fi)
+
+  AS_Z80 = $(top_builddir)/bin/as-z80
 
-UCZ80 = $(shell if [ -f $(SZ80A) ]; then echo $(SZ80A); else echo $(SZ80B); fi)
+  SDCCFLAGS += --nostdinc -I$(top_srcdir)
+  LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/z80
+endif
 
-SDCCFLAGS +=-mz80 --less-pedantic --profile -DREENTRANT= -I$(top_srcdir)
+SDCCFLAGS +=-mz80 --less-pedantic --profile -DREENTRANT=
 #SDCCFLAGS +=--less-pedantic -DREENTRANT=reentrant
-LINKFLAGS = --nostdlib
 LINKFLAGS += z80.lib
-LIBDIR = $(top_builddir)device/lib/build/z80
 
 #OBJEXT = .o
 EXEEXT = .ihx
@@ -21,10 +29,10 @@ EXTRAS = $(PORT_CASES_DIR)/testfwk$(OBJEXT) $(PORT_CASES_DIR)/support$(OBJEXT)
 
 # Rule to link into .ihx
 %.ihx: %.c $(EXTRAS)
-       $(SDCC) $(SDCCFLAGS) $(LINKFLAGS) -L $(LIBDIR) $(EXTRAS) $< -o $@
+       $(SDCC) $(SDCCFLAGS) $(LINKFLAGS) $(EXTRAS) $< -o $@
 
 $(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/$(PORT)/%.asm
-       $(top_builddir)bin/as-z80 -plosgff $@ $<
+       $(AS_Z80) -plosgff $@ $<
 
 %$(OBJEXT): %.c
        $(SDCC) $(SDCCFLAGS) -c $< -o $@
@@ -44,6 +52,6 @@ $(PORT_CASES_DIR)/%$(OBJEXT): fwk/lib/%.c
        -grep -n FAIL $@ /dev/null || true
 
 $(CASES_DIR)/timeout: fwk/lib/timeout.c
-       $(CC) $< -o $@
+       $(CC) $(CFLAGS) $< -o $@
 
 _clean: