[@spackbot] updating style on behalf of trws
This commit is contained in:
parent
0663ac3633
commit
ddc5dc7da3
@ -1026,7 +1026,6 @@ def get_env_modifications(self) -> EnvironmentModifications:
|
||||
run_env_mods.drop("CC", "CXX", "F77", "FC")
|
||||
env.extend(run_env_mods)
|
||||
|
||||
|
||||
return env
|
||||
|
||||
def _make_buildtime_detectable(self, dep: spack.spec.Spec, env: EnvironmentModifications):
|
||||
|
@ -3,8 +3,8 @@
|
||||
#
|
||||
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
|
||||
|
||||
import re
|
||||
import os
|
||||
import re
|
||||
|
||||
from spack.package import *
|
||||
|
||||
@ -94,8 +94,12 @@ def setup_build_environment(self, env):
|
||||
|
||||
# Manually inject the path of openssl's certs for build.
|
||||
certs = None
|
||||
for p in ("etc/openssl/cert.pem", "../etc/openssl/cert.pem",
|
||||
"etc/ssl/certs/ca-bundle.crt", "../etc/ssl/certs/ca-bundle.crt"):
|
||||
for p in (
|
||||
"etc/openssl/cert.pem",
|
||||
"../etc/openssl/cert.pem",
|
||||
"etc/ssl/certs/ca-bundle.crt",
|
||||
"../etc/ssl/certs/ca-bundle.crt",
|
||||
):
|
||||
certs = join_path(self.spec["openssl"].prefix, p)
|
||||
if os.path.exists(certs):
|
||||
break
|
||||
|
Loading…
Reference in New Issue
Block a user