From: Henry Cook <hcook@eecs.berkeley.edu>
Date: Sat, 1 Feb 2014 00:00:49 +0000 (-0800)
Subject: Minor Makefile improvements
X-Git-Url: https://git.libre-soc.org/?p=riscv-tests.git;a=commitdiff_plain;h=6ff9837501d34c1c8f87ded1fb05fe95987dba2d

Minor Makefile improvements
---

diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index dee7b23..b4dbffc 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -60,7 +60,7 @@ RISCV_SIM = spike
 VPATH += $(addprefix $(bmarkdir)/, $(bmarks))
 VPATH += $(bmarkdir)/common
 
-incs  += -I../env -I$(bmarkdir)/common $(addprefix -I$(bmarkdir)/, $(bmarks))
+incs  += -I$(bmarkdir)/../env -I$(bmarkdir)/common $(addprefix -I$(bmarkdir)/, $(bmarks))
 objs  :=
 
 include $(patsubst %, $(bmarkdir)/%/bmark.mk, $(bmarks))
diff --git a/mt/Makefile b/mt/Makefile
index 21f75f9..455f066 100755
--- a/mt/Makefile
+++ b/mt/Makefile
@@ -93,14 +93,14 @@ RISCV_GCC_OPTS = -std=gnu99 -T common/test.ld -O3 -nostdlib -nostartfiles -funro
 RISCV_LINK = riscv-gcc -T $(common)/test.ld
 RISCV_LINK_MT = riscv-gcc -T $(common)/test-mt.ld
 RISCV_LINK_OPTS = -lc
-RISCV_LINK_SYSCALL = $(common)/syscalls.c -lc
+RISCV_LINK_SYSCALL = -I$(bmarkdir)/../env $(common)/syscalls.c -lc
 RISCV_OBJDUMP = riscv-objdump --disassemble-all --disassemble-zeroes --section=.text --section=.text.startup --section=.data
 RISCV_SIM = spike -p2
 
 VPATH += $(addprefix $(bmarkdir)/, $(bmarks))
 VPATH += $(common)
 
-incs  += -I. -I$(common) $(addprefix -I$(bmarkdir)/, $(bmarks))
+incs  += -I. -I$(bmarkdir)/../env -I$(common) $(addprefix -I$(bmarkdir)/, $(bmarks))
 objs  :=
 
 #include $(patsubst %, $(bmarkdir)/%/bmark.mk, $(bmarks))