From a9d55db96cd553d988c30b8d78b3273331d101e7 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <andrew@sifive.com>
Date: Tue, 20 Dec 2016 14:43:58 -0800
Subject: 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.
---
 Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'Makefile')

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
-- 
cgit v1.2.3