Merge pull request #1068 from climbfuji/feature/revert_uppercase_root

release/1.7.0: revert uppercase PACKAGE_ROOT env vars
JCSDA · Apr 10, 2024 · 47343de · 47343de
2 parents a58b90b + b733b40
commit 47343de
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/configs/common/modules_lmod.yaml b/configs/common/modules_lmod.yaml
@@ -114,11 +114,6 @@ modules:
         environment:
           set:
             'HDF5_DIR': '{prefix}'
-      # For backward compatibility; spack-stack-1.7.0 only
-      jedi-cmake:
-        environment:
-          set:
-            'jedi_cmake_ROOT': '{prefix}'
       libpng:
         environment:
           set:

diff --git a/configs/common/modules_tcl.yaml b/configs/common/modules_tcl.yaml
@@ -116,11 +116,6 @@ modules:
         environment:
           set:
             'HDF5_DIR': '{prefix}'
-      # For backward compatibility; spack-stack-1.7.0 only
-      jedi-cmake:
-        environment:
-          set:
-            'jedi_cmake_ROOT': '{prefix}'
       libpng:
         environment:
           set:

diff --git a/spack b/spack
+3 −1		lib/spack/spack/modules/common.py
+2 −2		lib/spack/spack/test/modules/tcl.py