summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Lawson2015-09-28 11:22:12 -0700
committerJim Lawson2015-09-28 11:22:12 -0700
commit16f00d0947b9c9ebb3b30e040834eb79fcb14f46 (patch)
tree7415fbe3e27e8358c0204b9c4485f292268ce7be
parent02dd043ee5c41886e12f491ba56c14facc0afd1e (diff)
Remove cross compilation targets (Chisel3 is Scala 2.11 or later).
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index e0d9469f..2aa83bf2 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ smoke:
$(SBT) $(SBT_FLAGS) compile
publish-local:
- $(SBT) $(SBT_FLAGS) +publish-local
+ $(SBT) $(SBT_FLAGS) publish-local
test:
$(SBT) $(SBT_FLAGS) test
@@ -45,7 +45,7 @@ coverage:
$(SBT) $(SBT_FLAGS) coverageReport
clean:
- $(SBT) $(SBT_FLAGS) +clean
+ $(SBT) $(SBT_FLAGS) clean
ifneq (,$(CLEAN_DIRS))
for dir in $(CLEAN_DIRS); do $(MAKE) -C $$dir clean; done
endif
@@ -65,8 +65,8 @@ site:
# and we don't want code with those dependencies published.
# We need to run the coverage tests last, since Jenkins will fail the build if it can't find their results.
jenkins-build: clean
- $(SBT) $(SBT_FLAGS) +test
- $(SBT) $(SBT_FLAGS) +clean +publish-local
+ $(SBT) $(SBT_FLAGS) test
+ $(SBT) $(SBT_FLAGS) clean publish-local
$(SBT) $(SBT_FLAGS) scalastyle coverage test
$(SBT) $(SBT_FLAGS) coverageReport