aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Waterman <andrew@sifive.com>2019-03-25 01:26:48 -0700
committerAndrew Waterman <andrew@sifive.com>2019-03-31 17:13:50 -0700
commit4ff55aa8e96066a6136cacd31decf3cd8e7b73e6 (patch)
treecca796fab6f1d30245d7b8dd21d878adb323080f
parentb1ef25c962a8449e9108013481a21ae377b9036e (diff)
downloadriscv-tools-4ff55aa8e96066a6136cacd31decf3cd8e7b73e6.zip
riscv-tools-4ff55aa8e96066a6136cacd31decf3cd8e7b73e6.tar.gz
riscv-tools-4ff55aa8e96066a6136cacd31decf3cd8e7b73e6.tar.bz2
Fix openocd build by removing crosstools automake/aclocal
-rw-r--r--.travis.yml3
1 files changed, 3 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index d6b0471..958603f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -71,6 +71,9 @@ script:
- cp .build/riscv64-unknown-elf/build/build-libc/riscv64-unknown-elf/libgloss/riscv/crt0.o .build/riscv64-unknown-elf/buildtools/lib/gcc/riscv64-unknown-elf/8.3.0
- cp -r .build/src/newlib-3.1.0.20181231/newlib/libc/include .build/riscv64-unknown-elf/buildtools/lib/gcc/riscv64-unknown-elf/8.3.0/../../../../riscv64-unknown-elf/include
- cp .build/riscv64-unknown-elf/build/build-libc/riscv64-unknown-elf/newlib/libm.a .build/riscv64-unknown-elf/buildtools/lib/gcc/riscv64-unknown-elf/8.3.0
+ # Remove new autotools from path
+ - rm -f .build/riscv64-unknown-elf/buildtools/bin/automake*
+ - rm -f .build/riscv64-unknown-elf/buildtools/bin/aclocal*
# Actually test this repo
- ./build.sh
- PYTHONPATH=$PYTHONPATH:/usr/lib/python2.7/dist-packages make -C riscv-tests/build debug-check