zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[@spackbot] updating style on behalf of trws

Browse Source
This commit is contained in:
trws 2023-11-06 19:57:13 +00:00
parent 0663ac3633
commit ddc5dc7da3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/spack/spack/build_environment.py
View File

@ -1026,7 +1026,6 @@ def get_env_modifications(self) -> EnvironmentModifications:
run_env_mods.drop("CC", "CXX", "F77", "FC") run_env_mods.drop("CC", "CXX", "F77", "FC")
env.extend(run_env_mods) env.extend(run_env_mods)
return env return env
def _make_buildtime_detectable(self, dep: spack.spec.Spec, env: EnvironmentModifications): def _make_buildtime_detectable(self, dep: spack.spec.Spec, env: EnvironmentModifications):

10
var/spack/repos/builtin/packages/rust/package.py
View File

@ -3,8 +3,8 @@
# #
# SPDX-License-Identifier: (Apache-2.0 OR MIT) # SPDX-License-Identifier: (Apache-2.0 OR MIT)
import re
import os import os
import re
from spack.package import * from spack.package import *
@ -94,8 +94,12 @@ def setup_build_environment(self, env):
# Manually inject the path of openssl's certs for build. # Manually inject the path of openssl's certs for build.
certs = None certs = None
for p in ("etc/openssl/cert.pem", "../etc/openssl/cert.pem", for p in (
"etc/ssl/certs/ca-bundle.crt", "../etc/ssl/certs/ca-bundle.crt"): "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) certs = join_path(self.spec["openssl"].prefix, p)
if os.path.exists(certs): if os.path.exists(certs):
break break