summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Waterman <andrew@sifive.com>2016-12-20 14:43:58 -0800
committerAndrew Waterman <andrew@sifive.com>2016-12-20 14:43:58 -0800
commita9d55db96cd553d988c30b8d78b3273331d101e7 (patch)
treef588c92231b6efa12cfdb02c01c97d34945b3a4c
parent2a62b24ac45fddc536546e5d1520f5dddd169e16 (diff)
Completely ignore RISCV environment variable
This Makefile installs the tools in a fixed location and ignores $RISCV, so $RISCV should not be used to set $PATH. The incorrect $PATH setting prevents the compiler from building, as it can't find the assembler.
-rw-r--r--Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 33187d3..272ca15 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,3 @@
-RISCV ?= $(CURDIR)/toolchain
-PATH := $(RISCV)/bin:$(PATH)
-
srcdir := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
srcdir := $(srcdir:/=)
wrkdir := $(CURDIR)/work
@@ -43,6 +40,7 @@ help :
toolchain_srcdir := $(srcdir)/riscv-gnu-toolchain
toolchain32_wrkdir := $(wrkdir)/riscv32-gnu-toolchain
toolchain_dest := $(CURDIR)/toolchain
+PATH := $(toolchain_dest)/bin:$(PATH)
openocd_srcdir := $(srcdir)/openocd
openocd_wrkdir := $(wrkdir)/openocd