[ostree] ostbuild: Actually do check for Makefile
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] ostbuild: Actually do check for Makefile
- Date: Wed, 18 Jan 2012 22:09:18 +0000 (UTC)
commit 970682a7794b9728a8ccb9d068e6fcaa6483f522
Author: Colin Walters <walters verbum org>
Date: Wed Jan 18 17:08:30 2012 -0500
ostbuild: Actually do check for Makefile
Just kidding, we need the makefile path to check for .NOTPARALLEL
src/ostbuild/pyostbuild/builtin_compile_one.py | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/src/ostbuild/pyostbuild/builtin_compile_one.py b/src/ostbuild/pyostbuild/builtin_compile_one.py
index 88b3d11..cd2983d 100755
--- a/src/ostbuild/pyostbuild/builtin_compile_one.py
+++ b/src/ostbuild/pyostbuild/builtin_compile_one.py
@@ -152,6 +152,14 @@ class OstbuildCompileOne(builtins.Builtin):
args.extend(self.configargs)
run_sync(args, cwd=builddir)
+ makefile_path = None
+ for name in ['Makefile', 'makefile', 'GNUmakefile']:
+ makefile_path = os.path.join(builddir, name)
+ if os.path.exists(makefile_path):
+ break
+ if makefile_path is None:
+ fatal("No Makefile found")
+
args = list(self.makeargs)
user_specified_jobs = False
for arg in args:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]