From c4923fe3b3ee28ac47311411a631b228aaefef38 Mon Sep 17 00:00:00 2001 From: Xavier Delaruelle Date: Fri, 24 Mar 2023 20:38:24 +0100 Subject: modules: add support for append_flags/remove_flags (#36402) Adapt tcl and lmod modulefile templates to generate append-path or remove-path commands in modulefile when respectively append_flags or remove_flags commands are defined in package for run environment. Fixes #10299. --- share/spack/templates/modules/modulefile.lua | 4 ++-- share/spack/templates/modules/modulefile.tcl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/spack/templates/modules/modulefile.lua b/share/spack/templates/modules/modulefile.lua index 146a8e882d..8a8329ecd1 100644 --- a/share/spack/templates/modules/modulefile.lua +++ b/share/spack/templates/modules/modulefile.lua @@ -70,9 +70,9 @@ depends_on("{{ module }}") {% for command_name, cmd in environment_modifications %} {% if command_name == 'PrependPath' %} prepend_path("{{ cmd.name }}", "{{ cmd.value }}", "{{ cmd.separator }}") -{% elif command_name == 'AppendPath' %} +{% elif command_name in ('AppendPath', 'AppendFlagsEnv') %} append_path("{{ cmd.name }}", "{{ cmd.value }}", "{{ cmd.separator }}") -{% elif command_name == 'RemovePath' %} +{% elif command_name in ('RemovePath', 'RemoveFlagsEnv') %} remove_path("{{ cmd.name }}", "{{ cmd.value }}", "{{ cmd.separator }}") {% elif command_name == 'SetEnv' %} setenv("{{ cmd.name }}", "{{ cmd.value }}") diff --git a/share/spack/templates/modules/modulefile.tcl b/share/spack/templates/modules/modulefile.tcl index be53856ba7..5ea976fbdd 100644 --- a/share/spack/templates/modules/modulefile.tcl +++ b/share/spack/templates/modules/modulefile.tcl @@ -43,9 +43,9 @@ conflict {{ name }} {% for command_name, cmd in environment_modifications %} {% if command_name == 'PrependPath' %} prepend-path --delim "{{ cmd.separator }}" {{ cmd.name }} "{{ cmd.value }}" -{% elif command_name == 'AppendPath' %} +{% elif command_name in ('AppendPath', 'AppendFlagsEnv') %} append-path --delim "{{ cmd.separator }}" {{ cmd.name }} "{{ cmd.value }}" -{% elif command_name == 'RemovePath' %} +{% elif command_name in ('RemovePath', 'RemoveFlagsEnv') %} remove-path --delim "{{ cmd.separator }}" {{ cmd.name }} "{{ cmd.value }}" {% elif command_name == 'SetEnv' %} setenv {{ cmd.name }} "{{ cmd.value }}" -- cgit v1.2.3-60-g2f50