Fixed up s51 autodetect

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

diff --git a/support/regression/ports/mcs51/spec.mk b/support/regression/ports/mcs51/spec.mk
index 560f14eb909527d4e6435c275f437625f9f647af..d2d05045c133dc05dad58d5ea307f3e0dec28438 100644 (file)
--- a/support/regression/ports/mcs51/spec.mk
+++ b/support/regression/ports/mcs51/spec.mk
@@ -3,7 +3,10 @@
 # model small
 
 # path to uCsim
-S51 = ../../sim/ucsim/s51.src/s51
+S51A = $(SDCC_DIR)/sim/ucsim/s51.src/s51
+S51B = $(SDCC_DIR)/bin/s51
+
+S51 = $(shell if [ -f $(S51A) ]; then echo $(S51A); else echo $(S51B); fi)
 
 SDCCFLAGS +=--lesspedantic -DREENTRANT=reentrant --stack-after-data
 
@@ -29,7 +32,6 @@ EXTRAS = fwk/lib/testfwk$(OBJEXT) $(PORTS_DIR)/$(PORT)/support$(OBJEXT)
        -grep -n FAIL $@ /dev/null || true
 
 fwk/lib/timeout: fwk/lib/timeout.c
-       gcc -o $@ $<
 
 _clean:
        rm -f fwk/lib/timeout fwk/lib/timeout.exe $(PORTS_DIR)/$(PORT)/*.rel $(PORTS_DIR)/$(PORT)/*.rst \