From 861600217adae43efea62e78c7b9eb3a069331da Mon Sep 17 00:00:00 2001
From: Palmer Dabbelt <palmer@dabbelt.com>
Date: Fri, 22 Sep 2017 12:22:18 -0700
Subject: [PATCH] Build dejagnu locally, it appears this has disappeared from
 Travis

---
 Makefile.in | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 67b6ad7c..f75ac63b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -372,13 +372,20 @@ stamps/build-qemu: $(srcdir)/riscv-qemu
 	$(MAKE) -C $(notdir $@) install
 	date > $@
 
-check-gdb-newlib: stamps/build-gcc-newlib-stage2
+stamps/build-dejagnu: $(srcdir)/riscv-dejagnu
+	rm -rf $@ $(notdir $@)
+	mkdir $(notdir $@)
+	cd $(notdir $@) && $</configure \
+		--prefix=$(INSTALL_DIR)
+	$(MAKE) -C $(notdir $@)
+
+check-gdb-newlib: stamps/build-gcc-newlib-stage2 stamps/build-dejagnu
 	export PATH=$(INSTALL_DIR)/bin:$(PATH) && \
 	export DEJAGNULIBS=$(srcdir)/riscv-dejagnu && \
 	cd build-binutils-newlib && \
 	$(MAKE) check-gdb "RUNTESTFLAGS=--target_board=riscv-sim"
 
-stamps/check-gcc-newlib: stamps/build-gcc-newlib-stage2 stamps/build-qemu
+stamps/check-gcc-newlib: stamps/build-gcc-newlib-stage2 stamps/build-qemu stamps/build-dejagnu
 	export PATH=$(srcdir)/scripts/wrapper/qemu:$(INSTALL_DIR)/bin:$(PATH) && \
 	export DEJAGNULIBS=$(srcdir)/riscv-dejagnu && \
 	export RISC_V_SYSROOT=$(SYSROOT) && \
@@ -386,7 +393,7 @@ stamps/check-gcc-newlib: stamps/build-gcc-newlib-stage2 stamps/build-qemu
 	$(MAKE) check-gcc "RUNTESTFLAGS=--target_board='$(NEWLIB_TARGET_BOARDS)'"
 	date > $@
 
-stamps/check-gcc-linux: stamps/build-gcc-linux-stage2 stamps/build-qemu
+stamps/check-gcc-linux: stamps/build-gcc-linux-stage2 stamps/build-qemu stamps/build-dejagnu
 	export PATH=$(srcdir)/scripts/wrapper/qemu:$(INSTALL_DIR)/bin:$(PATH) && \
 	export DEJAGNULIBS=$(srcdir)/riscv-dejagnu && \
 	export RISC_V_SYSROOT=$(SYSROOT) && \