summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2019-11-07 06:44:33 -0500
committerRobert Morris <[email protected]>2019-11-07 06:44:33 -0500
commitd1b8b19cd36299555be2085f526f48a639e5b7e6 (patch)
tree143176bea1b1c55ec3ae1cce15a21840a240a90f
parent20f1dd940964d7e01cf8c8d9b1a5b751840b7f3b (diff)
parent73e931fd420163cb3e7757a3426ca650b4cd3419 (diff)
downloadxv6-labs-d1b8b19cd36299555be2085f526f48a639e5b7e6.tar.gz
xv6-labs-d1b8b19cd36299555be2085f526f48a639e5b7e6.tar.bz2
xv6-labs-d1b8b19cd36299555be2085f526f48a639e5b7e6.zip
Merge branch 'riscv' of g.csail.mit.edu:xv6-dev into riscv
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 574911b..7bfee58 100644
--- a/Makefile
+++ b/Makefile
@@ -40,6 +40,8 @@ TOOLPREFIX := $(shell if riscv64-unknown-elf-objdump -i 2>&1 | grep 'elf64-big'
then echo 'riscv64-unknown-elf-'; \
elif riscv64-linux-gnu-objdump -i 2>&1 | grep 'elf64-big' >/dev/null 2>&1; \
then echo 'riscv64-linux-gnu-'; \
+ elif riscv64-unknown-linux-gnu-objdump -i 2>&1 | grep 'elf64-big' >/dev/null 2>&1; \
+ then echo 'riscv64-unknown-linux-gnu-'; \
else echo "***" 1>&2; \
echo "*** Error: Couldn't find a riscv64 version of GCC/binutils." 1>&2; \
echo "*** To turn off this error, run 'gmake TOOLPREFIX= ...'." 1>&2; \