diff options
| author | Rolf Bjarne Kvinge <rolf@xamarin.com> | 2018-04-19 18:20:25 +0300 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2018-04-19 18:20:25 +0300 |
| commit | a9eac69ffcfe8bc7e28f7b9684d244de19f83ebb (patch) | |
| tree | e3f7a5dfe961f907fd1f8d57c5f759f8fcc662f9 /sdks/builds/runtime.mk | |
| parent | cd075b31b1227454a412e846725eb8318fe6a59c (diff) | |
[sdks] Wrap configure to provide better output. (#8306)
* [sdks] Wrap configure to provide better output.
Wrap configure in a script that:
* Captures stdout/stderr and only shows it in case of errors.
* If configure fails, and a cache file was used, deletes the cache file and
tries again.
* If configure really fails, then print config.log in addition to
stdout/stderr, since a lot of valuable diagnostic output is in that file
(and it's annoying to track down configure failures on bots when the file
with the important output has already been deleted).
* Only show config.log when running on bots.
Diffstat (limited to 'sdks/builds/runtime.mk')
| -rw-r--r-- | sdks/builds/runtime.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sdks/builds/runtime.mk b/sdks/builds/runtime.mk index 876585b7496..9c82a71616d 100644 --- a/sdks/builds/runtime.mk +++ b/sdks/builds/runtime.mk @@ -50,7 +50,7 @@ __$(1)_CONFIGURE_ENVIRONMENT = \ .stamp-$(1)-$$(CONFIGURATION)-configure: $$(TOP)/configure .stamp-$(1)-toolchain mkdir -p $$(TOP)/sdks/builds/$(1)-$$(CONFIGURATION) - cd $$(TOP)/sdks/builds/$(1)-$$(CONFIGURATION) && $(if $$(_$(1)_PATH),PATH="$$$$PATH:$$(_$(1)_PATH)") $$(TOP)/configure $$(_$(1)_AC_VARS) $$(__$(1)_CONFIGURE_ENVIRONMENT) $$(_$(1)_CONFIGURE_FLAGS) + $(if $$(_$(1)_PATH),PATH="$$$$PATH:$$(_$(1)_PATH)") ./wrap-configure.sh $$(TOP)/sdks/builds/$(1)-$$(CONFIGURATION) $(abspath $(TOP)/configure) $$(_$(1)_AC_VARS) $$(__$(1)_CONFIGURE_ENVIRONMENT) $$(_$(1)_CONFIGURE_FLAGS) touch $$@ .PHONY: .stamp-$(1)-configure |