summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-07-31 18:05:40 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-02 09:30:11 +0100
commit1b52a28de81b8639375137395a3b162d84e92af5 (patch)
tree2de035dd290acd6e12c21a9e20d3a58309e5633d
parent4306ed5f8ff9182437900137a5c6a0ed4f5b263b (diff)
downloadpoky-1b52a28de81b8639375137395a3b162d84e92af5.tar.gz
meson: don't dump full error log on failure
If the configure fails then we don't really want to see hundreds of lines of test output (this would be similar to dumping out autoconf's config.log). The error includes the path of the full log if further debugging is required. (From OE-Core rev: 09917f582aa1a7b752fa96303e06f9f4712a1d86) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/meson.bbclass1
1 files changed, 0 insertions, 1 deletions
diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
index 66c44e8bb2..e3b452786d 100644
--- a/meta/classes/meson.bbclass
+++ b/meta/classes/meson.bbclass
@@ -101,7 +101,6 @@ CONFIGURE_FILES = "meson.build"
101meson_do_configure() { 101meson_do_configure() {
102 bbnote Executing meson ${EXTRA_OEMESON}... 102 bbnote Executing meson ${EXTRA_OEMESON}...
103 if ! meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON}; then 103 if ! meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON}; then
104 cat ${B}/meson-logs/meson-log.txt
105 bbfatal_log meson failed 104 bbfatal_log meson failed
106 fi 105 fi
107} 106}