summaryrefslogtreecommitdiff
path: root/tools/buildman/control.py
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-07-22 02:19:09 (GMT)
committerTom Rini <trini@ti.com>2014-07-29 15:48:40 (GMT)
commit99796923831445f29b029a0b6c15e8130bea393a (patch)
treea1d7def7461fa969688c8aedd0f8a8b163f88117 /tools/buildman/control.py
parente18fd9405cfa60765fdbb85af1b58a02e245ccb8 (diff)
downloadu-boot-99796923831445f29b029a0b6c15e8130bea393a.tar.xz
buildman: make sure to invoke GNU Make
Since the command name 'make' may not be GNU Make on some platforms such as FreeBSD, buildman should call scripts/show-gnu-make to get the command name for GNU MAKE (and error out if it is not found). Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-by: Simon Glass <sjg@chromium.org> Tested-by: Jeroen Hofstee <jeroen@myspectrum.nl>
Diffstat (limited to 'tools/buildman/control.py')
-rw-r--r--tools/buildman/control.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/buildman/control.py b/tools/buildman/control.py
index 2dd8043..267b7d9 100644
--- a/tools/buildman/control.py
+++ b/tools/buildman/control.py
@@ -14,6 +14,7 @@ import gitutil
import patchstream
import terminal
import toolchain
+import command
def GetPlural(count):
"""Returns a plural 's' if count is not 1"""
@@ -144,10 +145,16 @@ def DoBuildman(options, args):
if not options.step:
options.step = len(series.commits) - 1
+ gnu_make = command.Output(os.path.join(options.git,
+ 'scripts/show-gnu-make')).rstrip()
+ if not gnu_make:
+ print >> sys.stderr, 'GNU Make not found'
+ sys.exit(1)
+
# Create a new builder with the selected options
output_dir = os.path.join(options.output_dir, options.branch)
builder = Builder(toolchains, output_dir, options.git_dir,
- options.threads, options.jobs, checkout=True,
+ options.threads, options.jobs, gnu_make=gnu_make, checkout=True,
show_unknown=options.show_unknown, step=options.step)
builder.force_config_on_failure = not options.quick