From 017c6547d38b88a2b3121b88f61dfe50cd3fa266 Mon Sep 17 00:00:00 2001 From: ducky Date: Sat, 16 Jan 2016 14:11:04 -0800 Subject: Default platform-agnostic, ignore platform-specific FileCheck --- .gitignore | 1 + README.md | 6 +++--- utils/bin/FileCheck | Bin 1017048 -> 0 bytes 3 files changed, 4 insertions(+), 3 deletions(-) delete mode 100755 utils/bin/FileCheck diff --git a/.gitignore b/.gitignore index 6a02ef4a..899e81f0 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ utils/bin/firrtl utils/bin/stanza utils/bin/firrtl-scala utils/bin/firrtl-stanza +utils/bin/FileCheck spec/spec.aux spec/spec.log spec/spec.toc diff --git a/README.md b/README.md index 01648fa9..cb1ef726 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,6 @@ 1. Actually build firrtl: `make build` 1. Run `make set-linux`, which links the FileCheck binary to the Linux version. - The original binary is compiled for Mac and will not work. * **Note**: This compiled binary may not run on all platforms. You may need to build Clang/LLVM from source to extract the compiled FileCheck utility. 1. Add `firrtl/utils/bin` to your `PATH`, so that the compiled firrtl will be @@ -45,6 +44,7 @@ `pip install lit` 1. Build firrtl: `make build` + 1. Run `make set-osx`, which links the FileCheck binary to the Mac version. 1. Run tests: `make check` 1. Build and test: @@ -57,6 +57,6 @@ Example use: 1. Build the fat JAR using the makefile: `make build-scala`, or using sbt: `sbt assembly` * For development, you can have sbt automatically monitor for changes and recompile: `sbt ~assembly` 1. Link firrtl to the Scala version: `make set-scala` (can be reverted with `make set-stanza`) - 1. Scala firrtl can be invoked in the same way as Stanza firrtl: + 1. Scala firrtl can be invoked in the same way as Stanza firrtl (and the test + make targets should continue to work): `./utils/bin/firrtl -i -o -X ` - * As a result, the test make targets should use Scala firrtl and work properly diff --git a/utils/bin/FileCheck b/utils/bin/FileCheck deleted file mode 100755 index 2ab52bb6..00000000 Binary files a/utils/bin/FileCheck and /dev/null differ -- cgit v1.2.3