1
0

bump chisel/firrtl

This commit is contained in:
Andrew Waterman 2016-10-27 23:45:01 -07:00
parent e45b41b4b6
commit 2b65478f3a
3 changed files with 5 additions and 2 deletions

View File

@ -19,9 +19,12 @@ SHELL := /bin/bash
FIRRTL_JAR ?= $(base_dir)/firrtl/utils/bin/firrtl.jar
FIRRTL ?= java -Xmx2G -Xss8M -XX:MaxPermSize=256M -cp $(FIRRTL_JAR) firrtl.Driver
# Build firrtl.jar and put it where chisel3 can find it.
$(FIRRTL_JAR): $(shell find $(base_dir)/firrtl/src/main/scala -iname "*.scala")
$(MAKE) -C $(base_dir)/firrtl SBT="$(SBT)" root_dir=$(base_dir)/firrtl build-scala
touch $(FIRRTL_JAR)
mkdir -p $(base_dir)/chisel3/lib
cp -p $(FIRRTL_JAR) $(base_dir)/chisel3/lib
src_path = src/main/scala
default_submodules = . hardfloat context-dependent-environments chisel3

@ -1 +1 @@
Subproject commit b18e98ba2d058c7dd24f96f005486b70c856aeca
Subproject commit 224ee397db324067b35874bf22c76a63e9ca531b

2
firrtl

@ -1 +1 @@
Subproject commit bcf73fb70969e5629a693c18f1f2ee7b37f14a76
Subproject commit 5b35f2d2722f72c81d2d6c507cd379be2a1476d8