summaryrefslogtreecommitdiff
path: root/var/spack/repos/builtin/packages/openssl/package.py
diff options
context:
space:
mode:
authoralalazo <massimiliano.culpo@googlemail.com>2016-06-18 13:31:29 +0200
committeralalazo <massimiliano.culpo@googlemail.com>2016-06-18 13:31:29 +0200
commita17d1efe7c738d08718fb46ae7a04d52c1a63dc1 (patch)
treea166e21e9410c4bbe9dd709dc34ccede3cc2e372 /var/spack/repos/builtin/packages/openssl/package.py
parent30c9d976f6e7b74b6713215e8f7c7924a9f43f43 (diff)
parent62b2f2a7c9d54fb864e6aae91f1f47a1b35d1828 (diff)
downloadspack-a17d1efe7c738d08718fb46ae7a04d52c1a63dc1.tar.gz
spack-a17d1efe7c738d08718fb46ae7a04d52c1a63dc1.tar.bz2
spack-a17d1efe7c738d08718fb46ae7a04d52c1a63dc1.tar.xz
spack-a17d1efe7c738d08718fb46ae7a04d52c1a63dc1.zip
Merge branch 'develop' of https://github.com/LLNL/spack into features/source_diffs_in_environment_modifications
Conflicts: lib/spack/spack/test/environment.py
Diffstat (limited to 'var/spack/repos/builtin/packages/openssl/package.py')
-rw-r--r--var/spack/repos/builtin/packages/openssl/package.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py
index 34ab0703ad..377bffe723 100644
--- a/var/spack/repos/builtin/packages/openssl/package.py
+++ b/var/spack/repos/builtin/packages/openssl/package.py
@@ -100,7 +100,7 @@ class Openssl(Package):
# in the environment, then this will override what is set in the
# Makefile, leading to build errors.
env.pop('APPS', None)
- if spec.satisfies("arch=darwin-x86_64") or spec.satisfies("arch=ppc64"):
+ if spec.satisfies("target=x86_64") or spec.satisfies("target=ppc64"):
# This needs to be done for all 64-bit architectures (except Linux,
# where it happens automatically?)
env['KERNEL_BITS'] = '64'