From 734c52038f4f2bf1fb379ee2c8438cd98fb7506d Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Mon, 6 Nov 2017 09:34:41 -0800
Subject: Default to unidoc for scaladoc generation. (#715)

Disambiguate DontCare reference in initializeSingletons() avoiding compilation error during unidoc generation.---
 Makefile                                                     | 2 +-
 chiselFrontend/src/main/scala/chisel3/internal/Builder.scala | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index e8d1f613..53740363 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@ ifneq (,$(RM_DIRS))
 endif
 
 scaladoc:
-	$(SBT) $(SBT_FLAGS) doc
+	$(SBT) $(SBT_FLAGS) unidoc
 
 site:
 	$(SBT) $(SBT_FLAGS) make-site
diff --git a/chiselFrontend/src/main/scala/chisel3/internal/Builder.scala b/chiselFrontend/src/main/scala/chisel3/internal/Builder.scala
index 90eabba3..0b279347 100644
--- a/chiselFrontend/src/main/scala/chisel3/internal/Builder.scala
+++ b/chiselFrontend/src/main/scala/chisel3/internal/Builder.scala
@@ -166,7 +166,7 @@ private[chisel3] object Builder {
 
   // Initialize any singleton objects before user code inadvertently inherits them.
   private def initializeSingletons(): Unit = {
-    val dummy = DontCare
+    val dummy = core.DontCare
   }
   def idGen: IdGen = dynamicContext.idGen
   def globalNamespace: Namespace = dynamicContext.globalNamespace
-- 
cgit v1.2.3