aboutsummaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
authorcomex2015-07-07 16:15:24 -0400
committercomex2015-07-07 16:15:24 -0400
commit193c6ba8dc61e2a3797ce4431656aa8491e11aaf (patch)
tree9afb47fd68111924c4789986027b0e00f9e1e741 /script
parentcommit new compiled version of darwin-inject-asm so i don't go crazy... (diff)
downloadsubstitute-193c6ba8dc61e2a3797ce4431656aa8491e11aaf.tar.gz
Werror, Makefile fix
Diffstat (limited to 'script')
-rw-r--r--script/mconfig.py4
1 files changed, 3 insertions, 1 deletions
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]),