diff --git a/lib/spack/spack/cmd/setup.py b/lib/spack/spack/cmd/setup.py
index e4ca38ba940..bb29fc8afe2 100644
--- a/lib/spack/spack/cmd/setup.py
+++ b/lib/spack/spack/cmd/setup.py
@@ -65,9 +65,9 @@ def spack_transitive_include_path():
     )
 
 
-def write_spconfig(package):
+def write_spconfig(package, dirty):
     # Set-up the environment
-    spack.build_environment.setup_package(package)
+    spack.build_environment.setup_package(package, dirty)
 
     cmd = [str(which('cmake'))] + package.std_cmake_args + package.cmake_args()
 
@@ -173,7 +173,8 @@ def setup(self, args):
         tty.msg(
             'Generating spconfig.py [{0}]'.format(package.spec.cshort_spec)
         )
-        write_spconfig(package)
+        dirty = args.dirty
+        write_spconfig(package, dirty)
         # Install this package to register it in the DB and permit
         # module file regeneration
         inst_args = copy.deepcopy(args)
diff --git a/lib/spack/spack/stage.py b/lib/spack/spack/stage.py
index c8309124bc6..d0072b25e22 100644
--- a/lib/spack/spack/stage.py
+++ b/lib/spack/spack/stage.py
@@ -662,6 +662,9 @@ def expand_archive(self):
     def restage(self):
         tty.die("Cannot restage DIY stage.")
 
+    def create(self):
+        self.created = True
+
     def destroy(self):
         # No need to destroy DIY stage.
         pass