diff options
author | Mark W. Krentel <krentel@rice.edu> | 2019-07-30 15:01:33 -0500 |
---|---|---|
committer | Peter Scheibel <scheibel1@llnl.gov> | 2019-07-31 20:44:40 -0700 |
commit | e628f1b4eb4cd9968b14c16018cf14276e74ad19 (patch) | |
tree | a2b4fc005f7ffeac305e0812551297f2d4eb0da0 | |
parent | 2c2abb454c3c4c2846da73dd2153682715ead763 (diff) | |
download | spack-e628f1b4eb4cd9968b14c16018cf14276e74ad19.tar.gz spack-e628f1b4eb4cd9968b14c16018cf14276e74ad19.tar.bz2 spack-e628f1b4eb4cd9968b14c16018cf14276e74ad19.tar.xz spack-e628f1b4eb4cd9968b14c16018cf14276e74ad19.zip |
unzip: fix build for cray back-end
Fixes #12007.
The Cray cc wrappers don't handle the -s flag (strip) cleanly, It's
not essential to strip the binary, so just remove the flag on Cray.
Note: the default build on Cray is for the back end and the unzip
binary won't run on the front end. To build for FE, use something
like arch=cray-fe-x86_64.
-rw-r--r-- | var/spack/repos/builtin/packages/unzip/package.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/unzip/package.py b/var/spack/repos/builtin/packages/unzip/package.py index 49477e1b5c..6abcd42248 100644 --- a/var/spack/repos/builtin/packages/unzip/package.py +++ b/var/spack/repos/builtin/packages/unzip/package.py @@ -14,9 +14,12 @@ class Unzip(MakefilePackage): version('6.0', '62b490407489521db863b523a7f86375') - conflicts('platform=cray', msg='Unzip does not currently build on Cray') + # The Cray cc wrapper doesn't handle the '-s' flag (strip) cleanly. + @when('platform=cray') + def patch(self): + filter_file(r'^LFLAGS2=.*', 'LFLAGS2=', join_path('unix', 'configure')) - make_args = ['-f', 'unix/Makefile'] + make_args = ['-f', join_path('unix', 'Makefile')] build_targets = make_args + ['generic'] def url_for_version(self, version): |