Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Spack
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
eic_tools
Spack
Commits
bc53bb9b
Unverified
Commit
bc53bb9b
authored
4 years ago
by
Sergey Kosukhin
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Unset environment variables that are most commonly used by Autotools packages. (#8623)
parent
ec58f28c
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/spack/spack/build_environment.py
+12
-0
12 additions, 0 deletions
lib/spack/spack/build_environment.py
lib/spack/spack/util/environment.py
+1
-1
1 addition, 1 deletion
lib/spack/spack/util/environment.py
with
13 additions
and
1 deletion
lib/spack/spack/build_environment.py
+
12
−
0
View file @
bc53bb9b
...
...
@@ -162,6 +162,18 @@ def clean_environment():
if
'
PKGCONF
'
in
varname
:
env
.
unset
(
varname
)
# Unset the following variables because they can affect installation of
# Autotools and CMake packages.
build_system_vars
=
[
'
CC
'
,
'
CFLAGS
'
,
'
CPP
'
,
'
CPPFLAGS
'
,
# C variables
'
CXX
'
,
'
CCC
'
,
'
CXXFLAGS
'
,
'
CXXCPP
'
,
# C++ variables
'
F77
'
,
'
FFLAGS
'
,
'
FLIBS
'
,
# Fortran77 variables
'
FC
'
,
'
FCFLAGS
'
,
'
FCLIBS
'
,
# Fortran variables
'
LDFLAGS
'
,
'
LIBS
'
# linker variables
]
for
v
in
build_system_vars
:
env
.
unset
(
v
)
build_lang
=
spack
.
config
.
get
(
'
config:build_language
'
)
if
build_lang
:
# Override language-related variables. This can be used to force
...
...
This diff is collapsed.
Click to expand it.
lib/spack/spack/util/environment.py
+
1
−
1
View file @
bc53bb9b
...
...
@@ -376,7 +376,7 @@ def unset(self, name, **kwargs):
"""
Stores a request to unset an environment variable.
Args:
name: name of the environment variable to be set
name: name of the environment variable to be
un
set
"""
kwargs
.
update
(
self
.
_get_outside_caller_attributes
())
item
=
UnsetEnv
(
name
,
**
kwargs
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment