Merge pull request #323 from eschnett/eschnett/openssl-apps

Ensure the APPS environment variable is not set when building OpenSSL
This commit is contained in:
Todd Gamblin 2016-01-12 09:13:50 -08:00
commit 5bdc6e53e5

View File

@ -17,6 +17,10 @@ class Openssl(Package):
parallel = False parallel = False
def install(self, spec, prefix): 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"): if spec.satisfies("=darwin-x86_64") or spec.satisfies("=ppc64"):
# This needs to be done for all 64-bit architectures (except Linux, # This needs to be done for all 64-bit architectures (except Linux,
# where it happens automatically?) # where it happens automatically?)