diff options
| author | Jim Lawson | 2015-07-16 14:14:01 -0700 |
|---|---|---|
| committer | Jim Lawson | 2015-07-24 15:50:54 -0700 |
| commit | 6c42f2560557ede48d9da0b8b63a6dc7a5e56d18 (patch) | |
| tree | bfff2f28f8fbc7a3a8b21e22d70fd95dbf4cad32 /Makefile | |
| parent | a7d7f64e2a29e5737f23a5d2a11b070c83a0be79 (diff) | |
Remove chiselVersion from Makefile; correct bit order for toBits; correct Vec() factory signature; Builder.pushCommands in test to avoid empty list head if tester manipulates Chisel nodes.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 4 insertions, 8 deletions
@@ -1,20 +1,16 @@ SBT ?= sbt SBT_FLAGS ?= -Dsbt.log.noformat=true -# If a chiselVersion is defined, use that. -# Otherwise, use the snapshot. -ifneq (,$(chiselVersion)) -SBT_FLAGS += -DchiselVersion="$(chiselVersion)" -else -SBT_FLAGS += -DchiselVersion="3.0-SNAPSHOT" -endif +CHISEL_VERSION := $(shell "$(SBT)" $(SBT_FLAGS) "show version" | tail -n 1 | cut -d ' ' -f 2) SRC_DIR ?= . CHISEL_BIN ?= $(SRC_DIR)/bin export CHISEL_BIN +$(info Build Chisel $(CHISEL_VERSION)) + SYSTEMC ?= $(SRC_DIR)/../../systemc/systemc-2.3.1 -CHISEL_JAR ?= $(SRC_DIR)/target/scala-2.11/chisel_2.11-3.0-SNAPSHOT.jar +CHISEL_JAR ?= $(SRC_DIR)/target/scala-2.11/chisel_2.11-$(CHISEL_VERSION).jar DRIVER ?= $(SRC_DIR)/src/test/resources/AddFilterSysCdriver.cpp # The targetDir will be rm -rf'ed when "make clean" targetDir ?= ./generated |