This reverts commit fa2472c17246206ce6947475782de17245eceeea.
Unified · Split
| @@ -60,13 +60,12 @@ endif · 59 unmodified lines | |||
| 60 | 60 | ||
| 61 | # run local version of tcc with local libraries and includes | 61 | # run local version of tcc with local libraries and includes |
| 62 | TCCFLAGS = -B$(TOP) -I$(TOP) -I$(top_srcdir) -I$(top_srcdir)/include -L$(TOP) | 62 | TCCFLAGS = -B$(TOP) -I$(TOP) -I$(top_srcdir) -I$(top_srcdir)/include -L$(TOP) |
| 63 | TCC = $(TOP)/tcc $(TCCFLAGS) | ||
| 64 | ifdef CONFIG_WIN32 | 63 | ifdef CONFIG_WIN32 |
| 65 | TCCFLAGS = -B$(top_srcdir)/win32 -I$(top_srcdir) -I$(top_srcdir)/include -L$(TOP) | 64 | TCCFLAGS = -B$(top_srcdir)/win32 -I$(top_srcdir) -I$(top_srcdir)/include -L$(TOP) |
| 66 | TCC = $(TOP)/win32/tcc $(TCCFLAGS) | ||
| 67 | endif | 65 | endif |
| 68 | XTCCFLAGS = -B$(TOP) -B$(top_srcdir)/win32 -I$(TOP) -I$(top_srcdir) -I$(top_srcdir)/include | 66 | XTCCFLAGS = -B$(TOP) -B$(top_srcdir)/win32 -I$(TOP) -I$(top_srcdir) -I$(top_srcdir)/include |
| 69 | 67 | ||
| 68 | TCC = $(TOP)/tcc $(TCCFLAGS) | ||
| 70 | RUN_TCC = $(NATIVE_DEFINES) -DONE_SOURCE -run $(top_srcdir)/tcc.c $(TCCFLAGS) | 69 | RUN_TCC = $(NATIVE_DEFINES) -DONE_SOURCE -run $(top_srcdir)/tcc.c $(TCCFLAGS) |
| 71 | 70 | ||
| 72 | DISAS = objdump -d | 71 | DISAS = objdump -d |
| @@ -2,17 +2,10 @@ · 1 unmodified line | |||
| 2 | # credits: 01..13.c from the pcc cpp-tests suite | 2 | # credits: 01..13.c from the pcc cpp-tests suite |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | TOP = ../.. | 5 | TCC = ../../tcc |
| 6 | include $(TOP)/Makefile | ||
| 7 | |||
| 8 | TCC = $(TOP)/tcc | ||
| 9 | TESTS = $(patsubst %.c,%.test,$(wildcard *.c)) | 6 | TESTS = $(patsubst %.c,%.test,$(wildcard *.c)) |
| 10 | TESTS += $(patsubst %.S,%.test,$(wildcard *.S)) | 7 | TESTS += $(patsubst %.S,%.test,$(wildcard *.S)) |
| 11 | 8 | ||
| 12 | ifdef CONFIG_WIN32 | ||
| 13 | TCC = $(top_srcdir)/win32/tcc | ||
| 14 | endif | ||
| 15 | |||
| 16 | all test : $(TESTS) | 9 | all test : $(TESTS) |
| 17 | 10 | ||
| 18 | %.test: %.c %.expect | 11 | %.test: %.c %.expect |
| @@ -19,10 +19,6 @@ endif · 18 unmodified lines | |||
| 19 | 19 | ||
| 20 | TCC = $(TOP)/tcc $(TCCFLAGS) | 20 | TCC = $(TOP)/tcc $(TCCFLAGS) |
| 21 | 21 | ||
| 22 | ifdef CONFIG_WIN32 | ||
| 23 | TCC = $(top_srcdir)/win32/tcc $(TCCFLAGS) | ||
| 24 | endif | ||
| 25 | |||
| 26 | TESTS = $(patsubst %.c,%.test,$(wildcard *.c)) | 22 | TESTS = $(patsubst %.c,%.test,$(wildcard *.c)) |
| 27 | 23 | ||
| 28 | # 34_array_assignment.test -- array assignment is not in C standard | 24 | # 34_array_assignment.test -- array assignment is not in C standard |