Fix setup for changes to dirty flag (#5592)
* Pass dirty arg through setup to setup_package
This commit is contained in:
		| @@ -65,9 +65,9 @@ def spack_transitive_include_path(): | |||||||
|     ) |     ) | ||||||
|  |  | ||||||
|  |  | ||||||
| def write_spconfig(package): | def write_spconfig(package, dirty): | ||||||
|     # Set-up the environment |     # 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() |     cmd = [str(which('cmake'))] + package.std_cmake_args + package.cmake_args() | ||||||
|  |  | ||||||
| @@ -173,7 +173,8 @@ def setup(self, args): | |||||||
|         tty.msg( |         tty.msg( | ||||||
|             'Generating spconfig.py [{0}]'.format(package.spec.cshort_spec) |             '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 |         # Install this package to register it in the DB and permit | ||||||
|         # module file regeneration |         # module file regeneration | ||||||
|         inst_args = copy.deepcopy(args) |         inst_args = copy.deepcopy(args) | ||||||
|   | |||||||
| @@ -662,6 +662,9 @@ def expand_archive(self): | |||||||
|     def restage(self): |     def restage(self): | ||||||
|         tty.die("Cannot restage DIY stage.") |         tty.die("Cannot restage DIY stage.") | ||||||
|  |  | ||||||
|  |     def create(self): | ||||||
|  |         self.created = True | ||||||
|  |  | ||||||
|     def destroy(self): |     def destroy(self): | ||||||
|         # No need to destroy DIY stage. |         # No need to destroy DIY stage. | ||||||
|         pass |         pass | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 becker33
					becker33