summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2016-01-12 09:13:50 -0800
committerTodd Gamblin <tgamblin@llnl.gov>2016-01-12 09:13:50 -0800
commit5bdc6e53e576cff26098d675784be197cd7a7f71 (patch)
treeab4257092e5bef958e408c929f7369688d61704f /var
parentdd0aa90aa1872c11ed19b58a020e4f38109ae00a (diff)
parent8af8c105597f3bdeb999e288f8201612d6756788 (diff)
downloadspack-5bdc6e53e576cff26098d675784be197cd7a7f71.tar.gz
spack-5bdc6e53e576cff26098d675784be197cd7a7f71.tar.bz2
spack-5bdc6e53e576cff26098d675784be197cd7a7f71.tar.xz
spack-5bdc6e53e576cff26098d675784be197cd7a7f71.zip
Merge pull request #323 from eschnett/eschnett/openssl-apps
Ensure the APPS environment variable is not set when building OpenSSL
Diffstat (limited to 'var')
-rw-r--r--var/spack/packages/openssl/package.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/var/spack/packages/openssl/package.py b/var/spack/packages/openssl/package.py
index a24de20cc3..bbb169ec6b 100644
--- a/var/spack/packages/openssl/package.py
+++ b/var/spack/packages/openssl/package.py
@@ -17,6 +17,10 @@ class Openssl(Package):
parallel = False
def install(self, spec, prefix):
+ # OpenSSL uses a variable APPS in its Makefile. If it happens to be set
+ # in the environment, then this will override what is set in the
+ # Makefile, leading to build errors.
+ env.pop('APPS', None)
if spec.satisfies("=darwin-x86_64") or spec.satisfies("=ppc64"):
# This needs to be done for all 64-bit architectures (except Linux,
# where it happens automatically?)