From 193c6ba8dc61e2a3797ce4431656aa8491e11aaf Mon Sep 17 00:00:00 2001
From: comex
Date: Tue, 7 Jul 2015 16:15:24 -0400
Subject: Werror, Makefile fix

---
 script/mconfig.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'script/mconfig.py')

diff --git a/script/mconfig.py b/script/mconfig.py
index 26556d6..88e5341 100644
--- a/script/mconfig.py
+++ b/script/mconfig.py
@@ -906,8 +906,10 @@ class MakefileEmitter(Emitter):
             # TODO avoid deleting partial output?
             stub = '''
 %(banner)s
-_ := $(shell "$(MAKE_COMMAND)" -s -f %(main_mk_arg)s %(makefile_arg)s >&2)
+_out := $(shell "$(MAKE_COMMAND)" -s -f %(main_mk_arg)s %(makefile_arg)s >&2 || echo fail)
+ifneq ($(_out),fail)
 include %(main_mk)s
+endif
 '''.lstrip() \
             % {
                 'makefile_arg': argv_to_shell([makefile]),
-- 
cgit v1.2.3