add python_executable cfg parameter

Author: Samuel Moors

easybuild/easyblocks/generic/buildenv.py

@@ -33,6 +33,8 @@
 import stat
 
 from easybuild.easyblocks.generic.bundle import Bundle
+from easybuild.framework.easyconfig import CUSTOM
+from easybuild.tools.build_log import EasyBuildError
 from easybuild.tools.filetools import adjust_permissions, apply_regex_substitutions, copy_dir
 from easybuild.tools.toolchain.toolchain import RPATH_WRAPPERS_SUBDIR
 
@@ -42,6 +44,15 @@ class BuildEnv(Bundle):
     Build environment of toolchain: only generate module file
     """
 
+    @staticmethod
+    def extra_options():
+        """Add extra easyconfig parameters for Boost."""
+        extra_vars = {
+            'python_executable': ['python3', "Python executable to use for the wrappers (use None to use path to "
+                                  "Python executable used by EasyBuild).", CUSTOM],
+        }
+        return Bundle.extra_options(extra_vars)
+
     def prepare_step(self, *args, **kwargs):
         """
         Custom prepare step for buildenv: export rpath wrappers if they are being used
@@ -63,10 +74,14 @@ def install_step(self, *args, **kwargs):
             self.rpath_wrappers_dir = os.path.join(self.installdir, 'bin')
             rpath_wrappers_path = os.path.join(self.rpath_wrappers_dir, RPATH_WRAPPERS_SUBDIR)
             copy_dir(wrappers_dir, rpath_wrappers_path)
-            wrapper_files = list(filter(os.path.isfile, glob.glob(os.path.join(rpath_wrappers_path, '*', '*'))))
-            # replace path to Python executable with python3 in the wrappers,
-            # as this is the executable that runs EasyBuild and may be unavailable when using the buildenv wrappers.
-            apply_regex_substitutions(wrapper_files, [(r'^PYTHON_EXE=.*$', 'PYTHON_EXE=python3')], backup=False)
+            py_exe = self.cfg['python_executable']
+            if py_exe is not None:
+                if not isinstance(py_exe, str) or not py_exe:
+                    raise EasyBuildError(f"python_executable should be None or non-empty string, got {py_exe}")
+                wrapper_files = list(filter(os.path.isfile, glob.glob(os.path.join(rpath_wrappers_path, '*', '*'))))
+                # replace path to Python executable with python_executable in the wrappers,
+                # as this is the executable that runs EasyBuild and may be unavailable when using the buildenv wrappers.
+                apply_regex_substitutions(wrapper_files, [(r'^PYTHON_EXE=.*$', f'PYTHON_EXE={py_exe}')], backup=False)
             # Make sure wrappers are readable/executable by everyone
             adjust_permissions(
                 self.rpath_wrappers_dir,