From 213a3de539202c5e1da5b730744ee214d8af64e7 Mon Sep 17 00:00:00 2001 From: Federico Ficarelli Date: Fri, 23 Mar 2018 10:05:54 +0100 Subject: [PATCH] Fix tclsh command for transitive dependencies (#7566) --- var/spack/repos/builtin/packages/tcl/package.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/tcl/package.py b/var/spack/repos/builtin/packages/tcl/package.py index 21a31efaf3..ab05352dc2 100644 --- a/var/spack/repos/builtin/packages/tcl/package.py +++ b/var/spack/repos/builtin/packages/tcl/package.py @@ -70,6 +70,14 @@ def symlink_tclsh(self): # ======================================================================== # Set up environment to make install easy for tcl extensions. # ======================================================================== + @property + def command(self): + """Returns the tclsh command. + + :returns: The tclsh command + :rtype: Executable + """ + return Executable(os.path.realpath(self.prefix.bin.tclsh)) @property def tcl_lib_dir(self): @@ -94,7 +102,7 @@ def setup_dependent_environment(self, spack_env, run_env, dependent_spec): # where a system provided tcl is run against the standard libraries # of a Spack built tcl. See issue #7128 that relates to python but # it boils down to the same situation we have here. - spack_env.prepend_path('PATH', os.path.dirname(self.prefix.bin)) + spack_env.prepend_path('PATH', os.path.dirname(self.command.path)) tcl_paths = [join_path(self.prefix, self.tcl_builtin_lib_dir)]