move write_spconfig into build_process (to avoid affecting current env); in this case write_spconfig doesnt have to invoke setup_package

scheibelp · scheibelp · commit 65c008e51e72 · 2019-01-29T19:36:33.000-08:00
diff --git a/lib/spack/spack/build_systems/cmake.py b/lib/spack/spack/build_systems/cmake.py
@@ -258,21 +258,6 @@ def check(self):
     run_after('install')(PackageBase.sanity_check_prefix)
 
     def write_spconfig(self, spack_env, spconfig_fname, dirty):
-        """Writes the spconfig.py (CMake setup file) to a file.
-        spack_env: Environment
-            If installing into an environment, this is it
-        spconfig_fname:
-            Leaf of filename for the resulting spconfig file.
-        dirty (bool): If True, do NOT clean the environment before
-            building.
-
-        Returns:
-            name of file written
-        """
-
-        # Execute all environment setup routines.
-        spack.build_environment.setup_package(self, dirty)
-
         fname = os.path.join(spack_env.path, spconfig_fname) \
             if spack_env is not None else spconfig_fname
 
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
@@ -1323,7 +1323,13 @@ def try_install_from_binary_cache(self, explicit):
         return True
 
     def write_spconfig(self, spack_env, spconfig_fname, dirty):
-        """Execute all environment setup routines (dummy virtual function).
+        """Dump environment variable modifications to a script that can be run
+        to replicate the Spack build environment for this package. This must
+        be supported on a per-build-system basis.
+
+        This function executes inside of the build environment that is created
+        by Spack for the package to install in.
+
         spack_env: Environment
             If installing into an environment, this is it
         spconfig_fname:
@@ -1391,6 +1397,7 @@ def do_install(self,
         is_setup = (self.name in setup)
         if is_setup:
             keep_prefix = True
+            explicit = True
 
         # For external packages the workflow is simplified, and basically
         # consists in module file generation and registration in the DB
@@ -1442,21 +1449,6 @@ def do_install(self,
                     setup=setup,
                     **kwargs)
 
-        if is_setup:
-            explicit = True
-            self.stage = DIYStage(os.getcwd())    # Force build in cwd
-
-            # --- Generate spconfig.py
-            spconfig_fname = self.name + '-setup.py'
-            tty.msg(
-                'Generating config file {0} [{1}]'.format(
-                    spconfig_fname, self.spec.cshort_spec))
-
-            # Calls virtual function of subclass
-            # (eg: CMakePackage, MakefilePackage, etc.)
-            spconfig_fname = self.write_spconfig(
-                spack_env, spconfig_fname, dirty)
-
         tty.msg(colorize('@*{Installing} @*g{%s}' % self.name))
 
         if kwargs.get('use_cache', True):
@@ -1510,7 +1502,17 @@ def build_process():
                 # the directory is created.
                 spack.hooks.pre_install(self.spec)
                 if is_setup:
-                    pass    # Don't write any files in the install...
+                    self.stage = DIYStage(os.getcwd())  # Force build in cwd
+
+                    spconfig_fname = self.name + '-setup.py'
+                    tty.msg(
+                        'Generating config file {0} [{1}]'.format(
+                            spconfig_fname, self.spec.cshort_spec))
+
+                    # Calls virtual function of subclass
+                    # (eg: CMakePackage, MakefilePackage, etc.)
+                    spconfig_fname = self.write_spconfig(
+                        spack_env, spconfig_fname, dirty)
                 elif fake:
                     self.do_fake_install()
                 else:
