summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-08-21 16:08:32 +0300
committerSaul Wold <sgw@linux.intel.com>2013-08-22 10:14:49 -0700
commit0a323abab1961caa334035f4f263f1787b3d7cc7 (patch)
tree6c040b11d9f312e4d53bfa643e2caeefffbe2842 /meta/recipes-support
parent41e0d3ed02017ad9d652275b7083b5b85cf49acc (diff)
downloadopenembedded-core-0a323abab1961caa334035f4f263f1787b3d7cc7.tar.gz
openembedded-core-0a323abab1961caa334035f4f263f1787b3d7cc7.tar.bz2
openembedded-core-0a323abab1961caa334035f4f263f1787b3d7cc7.zip
boost: fix build when PARALLEL_MAKE is not set
It was passing "None" to bjam, which then parsed it as unknown build target. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/boost/boost.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index 87bac23340..5d20b11e11 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -115,6 +115,8 @@ def get_boost_parallel_make(bb, d):
bb.error("Unable to analyse format of PARALLEL_MAKE variable: %s" % pm)
pm_nval = min(64, int(pm_val.group(0)))
return pm_prefix.group(0) + str(pm_nval) + pm[pm_val.end():]
+ else:
+ return ""
BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(bb, d)}"
BJAM_OPTS = '${BOOST_PARALLEL_MAKE} \