From 44c69cadf4ce5c71dbb4d1c10d326100e608fd29 Mon Sep 17 00:00:00 2001 From: "John W. Parent" <45471568+johnwparent@users.noreply.github.com> Date: Fri, 13 Jan 2023 22:28:29 -0500 Subject: [PATCH] Proper scons executable on Windows (#34934) --- var/spack/repos/builtin/packages/scons/package.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/scons/package.py b/var/spack/repos/builtin/packages/scons/package.py index c64cdee839d..a7ebfdd8429 100644 --- a/var/spack/repos/builtin/packages/scons/package.py +++ b/var/spack/repos/builtin/packages/scons/package.py @@ -2,9 +2,12 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +import sys from spack.package import * +is_windows = sys.platform == "win32" + class Scons(PythonPackage): """SCons is a software construction tool""" @@ -56,4 +59,7 @@ def setup_dependent_run_environment(self, env, dependent_spec): env.prepend_path("PYTHONPATH", self.prefix.lib.scons) def setup_dependent_package(self, module, dspec): - module.scons = Executable(self.spec.prefix.bin.scons) + if is_windows: + module.scons = Executable(self.spec.prefix.Scripts.scons) + else: + module.scons = Executable(self.spec.prefix.bin.scons)