summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2015-10-05 15:36:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:11 +0000
commit616766953cf8e3825e489b23a4dbed6e7e348547 (patch)
tree097d4b7d4e7d6bc6d972cd9d7686e6aa1336bb60 /meta
parente1ecccd0d46b602ac4dcee5983fe747a90e5f7a0 (diff)
downloadpoky-616766953cf8e3825e489b23a4dbed6e7e348547.tar.gz
busybox.inc: don't set .config CROSS_COMPILER_PREFIX
Setting CROSS_COMPILER_PREFIX via .config is redundant (setting CROSS_COMPILE via the make command line will always over-ride it). (From OE-Core rev: db2daff77a9d533dc03ab3aaeffa87e32f834240) 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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/busybox/busybox.inc6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index ac534a4acb..57da1dbc78 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -80,8 +80,7 @@ def features_to_busybox_del(d):
80 cnf, rem = features_to_busybox_settings(d) 80 cnf, rem = features_to_busybox_settings(d)
81 return rem 81 return rem
82 82
83configmangle = '/CROSS_COMPILER_PREFIX/d; \ 83configmangle = '/CONFIG_EXTRA_CFLAGS/d; \
84 /CONFIG_EXTRA_CFLAGS/d; \
85 ' 84 '
86OE_FEATURES := "${@features_to_busybox_conf(d)}" 85OE_FEATURES := "${@features_to_busybox_conf(d)}"
87OE_DEL := "${@features_to_busybox_del(d)}" 86OE_DEL := "${@features_to_busybox_del(d)}"
@@ -97,8 +96,7 @@ python () {
97 ("\\n".join((d.expand("${OE_FEATURES}").split("\n"))))) 96 ("\\n".join((d.expand("${OE_FEATURES}").split("\n")))))
98 d.setVar('configmangle_append', 97 d.setVar('configmangle_append',
99 "/^### CROSS$/a\\\n%s\n" % 98 "/^### CROSS$/a\\\n%s\n" %
100 ("\\n".join(["CONFIG_CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"", 99 ("\\n".join(["CONFIG_EXTRA_CFLAGS=\"${CFLAGS}\" \"${HOST_CC_ARCH}\""
101 "CONFIG_EXTRA_CFLAGS=\"${CFLAGS}\" \"${HOST_CC_ARCH}\""
102 ]) 100 ])
103 )) 101 ))
104} 102}