[gnome-builder] make: allow configurations to specify $MAKE environ
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] make: allow configurations to specify $MAKE environ
- Date: Sat, 11 Mar 2017 23:05:45 +0000 (UTC)
commit ee8142711c3cf2f863e941f203121eee10d4bb29
Author: Christian Hergert <chergert redhat com>
Date: Sat Mar 11 15:04:03 2017 -0800
make: allow configurations to specify $MAKE environ
If your system uses an alternate make (such as kmk for virtual box) you
might need to set that in build preferences. This allows us to use the
proper command to execute builds.
plugins/make/make_plugin/__init__.py | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/plugins/make/make_plugin/__init__.py b/plugins/make/make_plugin/__init__.py
index 79aee43..4108ce3 100644
--- a/plugins/make/make_plugin/__init__.py
+++ b/plugins/make/make_plugin/__init__.py
@@ -92,6 +92,9 @@ class MakePipelineAddin(Ide.Object, Ide.BuildPipelineAddin):
config = pipeline.get_configuration()
runtime = config.get_runtime()
+ # If the configuration has set $MAKE, then use it.
+ make = config.getenv('MAKE') or "make"
+
srcdir = context.get_vcs().get_working_directory().get_path()
builddir = build_system.get_builddir(config)
@@ -99,12 +102,12 @@ class MakePipelineAddin(Ide.Object, Ide.BuildPipelineAddin):
# build of the project when the Ide.BuildPhase.BUILD phase is
# requested of the pipeline.
build_launcher = pipeline.create_launcher()
- build_launcher.push_argv('make')
+ build_launcher.push_argv(make)
if config.props.parallelism > 0:
build_launcher.push_argv('-j{}'.format(config.props.parallelism))
clean_launcher = pipeline.create_launcher()
- clean_launcher.push_argv('make')
+ clean_launcher.push_argv(make)
clean_launcher.push_argv('clean')
build_stage = Ide.BuildStageLauncher.new(context, build_launcher)
@@ -116,7 +119,7 @@ class MakePipelineAddin(Ide.Object, Ide.BuildPipelineAddin):
# "make install" when the Ide.BuildPhase.INSTALL phase
# is requested of the pipeline.
install_launcher = pipeline.create_launcher()
- install_launcher.push_argv('make')
+ install_launcher.push_argv(make)
install_launcher.push_argv('install')
install_stage = Ide.BuildStageLauncher.new(context, install_launcher)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]