diff options
| author | Greg Lee <lee218@llnl.gov> | 2016-05-17 21:18:34 -0700 |
|---|---|---|
| committer | Greg Lee <lee218@llnl.gov> | 2016-05-17 21:18:34 -0700 |
| commit | 582d01784aa44024da598187c654947bfd2e55de (patch) | |
| tree | 09968984e51d7f7f5d3f4cdf690a742fa2aaf673 | |
| parent | c2ca5f44b4091821fbda36ce2dce77af3e4087f5 (diff) | |
| download | spack-582d01784aa44024da598187c654947bfd2e55de.tar.gz spack-582d01784aa44024da598187c654947bfd2e55de.tar.bz2 spack-582d01784aa44024da598187c654947bfd2e55de.tar.xz spack-582d01784aa44024da598187c654947bfd2e55de.zip | |
added newdtags variant, default to false (i.e., remove --enable-new-dtags)
| -rw-r--r-- | var/spack/repos/builtin/packages/intel-parallel-studio/package.py | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py index a176af101d..493ca16417 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -32,6 +32,8 @@ class IntelParallelStudio(IntelInstaller): url="file://%s/parallel_studio_xe_2016_update3.tgz" % os.getcwd()) # NOQA: ignore=E501 variant('rpath', default=True, description="Add rpath to .cfg files") + variant('newdtags', default=False, + description="Allow use of --enable-new-dtags in MPI wrappers") variant('all', default=False, description="Install all files with the requested edition") variant('mpi', default=True, @@ -116,6 +118,20 @@ VTune Amplifier, and Inspector tools""") spec.satisfies('@cluster'): os.symlink(self.global_license_file, os.path.join( self.prefix, "itac_latest", "license.lic")) + if spec.satisfies('~newdtags'): + wrappers = ["mpif77", "mpif77", "mpif90", "mpif90", + "mpigcc", "mpigcc", "mpigxx", "mpigxx", + "mpiicc", "mpiicc", "mpiicpc", "mpiicpc", + "mpiifort", "mpiifort"] + wrapper_paths = [] + for root, dirs, files in os.walk(spec.prefix): + for name in files: + if name in wrappers: + wrapper_paths.append(os.path.join(spec.prefix, + root, name)) + for wrapper in wrapper_paths: + filter_file(r'-Xlinker --enable-new-dtags', r' ', + wrapper) if spec.satisfies('+rpath'): for compiler_command in ["icc", "icpc", "ifort"]: |