diff options
| author | Tomoyasu Nojiri <68096132+t-nojiri@users.noreply.github.com> | 2021-01-15 02:56:24 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-14 11:56:24 -0600 |
| commit | d0891d5d26c98093229e94d56282300dfa8b72ac (patch) | |
| tree | 24817a385ab914ecb20a4ca249d213425426a1e5 | |
| parent | 74b2c85b41e15f846bd988c56389483f410419e4 (diff) | |
| download | spack-d0891d5d26c98093229e94d56282300dfa8b72ac.tar.gz spack-d0891d5d26c98093229e94d56282300dfa8b72ac.tar.bz2 spack-d0891d5d26c98093229e94d56282300dfa8b72ac.tar.xz spack-d0891d5d26c98093229e94d56282300dfa8b72ac.zip | |
astyle: Fix makefile for install parameter (#20899)
| -rw-r--r-- | var/spack/repos/builtin/packages/astyle/package.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/astyle/package.py b/var/spack/repos/builtin/packages/astyle/package.py index dec9a49d7d..48e4ba5164 100644 --- a/var/spack/repos/builtin/packages/astyle/package.py +++ b/var/spack/repos/builtin/packages/astyle/package.py @@ -4,7 +4,6 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * -import sys class Astyle(MakefilePackage): @@ -32,9 +31,9 @@ class Astyle(MakefilePackage): def edit(self, spec, prefix): makefile = join_path(self.build_directory, 'Makefile') filter_file(r'^CXX\s*=.*', 'CXX=%s' % spack_cxx, makefile) - # strangely enough install -o $(USER) -g $(USER) stoped working on OSX - if sys.platform == 'darwin': - filter_file(r'^INSTALL=.*', 'INSTALL=install', makefile) + # If the group is not a user account, the installation will fail, + # so remove the -o $ (USER) -g $ (USER) parameter. + filter_file(r'^INSTALL=.*', 'INSTALL=install', makefile) @property def install_targets(self): |