diff options
| author | Harmen Stoppels <me@harmenstoppels.nl> | 2023-11-01 09:14:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-01 09:14:37 +0100 |
| commit | 2ea8e6c820e78c08c5b5265056fb292511de9c04 (patch) | |
| tree | ec8a66dc19f5f8a9c9f3c0414d7051ec83caccc6 /var | |
| parent | ac976a4bf42d475328f26f34e70bf1317fc0bdec (diff) | |
| download | spack-2ea8e6c820e78c08c5b5265056fb292511de9c04.tar.gz spack-2ea8e6c820e78c08c5b5265056fb292511de9c04.tar.bz2 spack-2ea8e6c820e78c08c5b5265056fb292511de9c04.tar.xz spack-2ea8e6c820e78c08c5b5265056fb292511de9c04.zip | |
Executable.add_default_arg: multiple (#40801)
Diffstat (limited to 'var')
3 files changed, 3 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py b/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py index 5545053cc8..84b65a5761 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py @@ -226,8 +226,7 @@ class IntelOneapiCompilers(IntelOneApiPackage): def inject_rpaths(self): # Sets rpath so the compilers can work without setting LD_LIBRARY_PATH. patchelf = which("patchelf") - patchelf.add_default_arg("--set-rpath") - patchelf.add_default_arg(":".join(self._ld_library_path())) + patchelf.add_default_arg("--set-rpath", ":".join(self._ld_library_path())) for pd in ["bin", "lib", join_path("compiler", "lib", "intel64_lin")]: for file in find(self.component_prefix.linux.join(pd), "*", recursive=False): # Try to patch all files, patchelf will do nothing and fail if file diff --git a/var/spack/repos/builtin/packages/py-installer/package.py b/var/spack/repos/builtin/packages/py-installer/package.py index 30a4a62072..1bedecf074 100644 --- a/var/spack/repos/builtin/packages/py-installer/package.py +++ b/var/spack/repos/builtin/packages/py-installer/package.py @@ -40,6 +40,5 @@ class PyInstaller(Package, PythonExtension): def setup_dependent_package(self, module, dependent_spec): installer = dependent_spec["python"].command - installer.add_default_arg("-m") - installer.add_default_arg("installer") + installer.add_default_arg("-m", "installer") setattr(module, "installer", installer) diff --git a/var/spack/repos/builtin/packages/py-pip/package.py b/var/spack/repos/builtin/packages/py-pip/package.py index dfa85d55bc..d92a53671e 100644 --- a/var/spack/repos/builtin/packages/py-pip/package.py +++ b/var/spack/repos/builtin/packages/py-pip/package.py @@ -110,6 +110,5 @@ class PyPip(Package, PythonExtension): def setup_dependent_package(self, module, dependent_spec): pip = dependent_spec["python"].command - pip.add_default_arg("-m") - pip.add_default_arg("pip") + pip.add_default_arg("-m", "pip") setattr(module, "pip", pip) |