summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2015-10-05 15:46:05 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:11 +0000
commitf21dce10448200099a7368803e6c45b003644a5c (patch)
tree2f038df3a179f5f00fb83f4e84d8fe581fd6f53f
parent616766953cf8e3825e489b23a4dbed6e7e348547 (diff)
downloadpoky-f21dce10448200099a7368803e6c45b003644a5c.tar.gz
busybox.inc: fix CONFIG_EXTRA_CFLAGS configmangle
With current busybox Kbuild, setting .config to: CONFIG_EXTRA_CFLAGS="foo" "bar" and then running 'make oldconfig' results in .config containing: CONFIG_EXTRA_CFLAGS="foo" ie the CONFIG_EXTRA_CFLAGS configmangle in the busybox.inc doesn't currently work as intended. Remove the extra \" \" to ensure that ${HOST_CC_ARCH} gets added to CONFIG_EXTRA_CFLAGS. (From OE-Core rev: 5f822373fadff2415cf1602b9d58fae0dbd33730) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/busybox/busybox.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 57da1dbc78..03b6cf2944 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -96,7 +96,7 @@ python () {
96 ("\\n".join((d.expand("${OE_FEATURES}").split("\n"))))) 96 ("\\n".join((d.expand("${OE_FEATURES}").split("\n")))))
97 d.setVar('configmangle_append', 97 d.setVar('configmangle_append',
98 "/^### CROSS$/a\\\n%s\n" % 98 "/^### CROSS$/a\\\n%s\n" %
99 ("\\n".join(["CONFIG_EXTRA_CFLAGS=\"${CFLAGS}\" \"${HOST_CC_ARCH}\"" 99 ("\\n".join(["CONFIG_EXTRA_CFLAGS=\"${CFLAGS} ${HOST_CC_ARCH}\""
100 ]) 100 ])
101 )) 101 ))
102} 102}