summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarmen Stoppels <harmenstoppels@gmail.com>2021-02-23 13:35:19 +0100
committerGitHub <noreply@github.com>2021-02-23 13:35:19 +0100
commit0664b907513310b96708e09525bd36fbe37432fe (patch)
tree5189705501881d76d18b9c875ab6bdaa3664c09a
parentb1ae7592cad6270155a054f8d5c5898784637908 (diff)
downloadspack-0664b907513310b96708e09525bd36fbe37432fe.tar.gz
spack-0664b907513310b96708e09525bd36fbe37432fe.tar.bz2
spack-0664b907513310b96708e09525bd36fbe37432fe.tar.xz
spack-0664b907513310b96708e09525bd36fbe37432fe.zip
Drop compiler variables from spack load (#21699)
Drops: * C_INCLUDE_PATH * CPLUS_INCLUDE_PATH * LIBRARY_PATH * INCLUDE We already decided to use C_INCLUDE_PATH, CPLUS_INCLUDE_PATH, INCLUDE over CPATH here: https://github.com/spack/spack/pull/14749 However, none of these flags apply to Fortran on Linux. So for consistency it seems better to make the user use -I and -L flags by hand or through pkgconfig.
-rw-r--r--etc/spack/defaults/modules.yaml10
-rwxr-xr-xshare/spack/qa/setup-env-test.sh1
2 files changed, 0 insertions, 11 deletions
diff --git a/etc/spack/defaults/modules.yaml b/etc/spack/defaults/modules.yaml
index 5ae1b50fda..d6d245930c 100644
--- a/etc/spack/defaults/modules.yaml
+++ b/etc/spack/defaults/modules.yaml
@@ -25,16 +25,6 @@ modules:
- MANPATH
share/aclocal:
- ACLOCAL_PATH
- lib:
- - LIBRARY_PATH
- lib64:
- - LIBRARY_PATH
- include:
- - C_INCLUDE_PATH
- - CPLUS_INCLUDE_PATH
- # The INCLUDE env variable specifies paths to look for
- # .mod file for Intel Fortran compilers
- - INCLUDE
lib/pkgconfig:
- PKG_CONFIG_PATH
lib64/pkgconfig:
diff --git a/share/spack/qa/setup-env-test.sh b/share/spack/qa/setup-env-test.sh
index b22b109520..bef94dfe1f 100755
--- a/share/spack/qa/setup-env-test.sh
+++ b/share/spack/qa/setup-env-test.sh
@@ -109,7 +109,6 @@ succeeds spack -m load b
fails spack -m load -l
# test a variable MacOS clears and one it doesn't for recursive loads
contains "export LD_LIBRARY_PATH=$(spack -m location -i a)/lib:$(spack -m location -i b)/lib" spack -m load --sh a
-contains "export LIBRARY_PATH=$(spack -m location -i a)/lib:$(spack -m location -i b)/lib" spack -m load --sh a
succeeds spack -m load --only dependencies a
succeeds spack -m load --only package a
fails spack -m load d