]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
busybox.inc: don't set .config CROSS_COMPILER_PREFIX
authorAndre McCurdy <armccurdy@gmail.com>
Mon, 5 Oct 2015 22:36:43 +0000 (15:36 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 1 Dec 2015 21:32:11 +0000 (21:32 +0000)
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>
meta/recipes-core/busybox/busybox.inc

index ac534a4acb508f2a7ca97c1c38f4ebb9c57edab5..57da1dbc781dd7d6c72b4b6813019ae9a4703f70 100644 (file)
@@ -80,8 +80,7 @@ def features_to_busybox_del(d):
        cnf, rem = features_to_busybox_settings(d)
        return rem
 
-configmangle = '/CROSS_COMPILER_PREFIX/d; \
-               /CONFIG_EXTRA_CFLAGS/d; \
+configmangle = '/CONFIG_EXTRA_CFLAGS/d; \
                '
 OE_FEATURES := "${@features_to_busybox_conf(d)}"
 OE_DEL      := "${@features_to_busybox_del(d)}"
@@ -97,8 +96,7 @@ python () {
                    ("\\n".join((d.expand("${OE_FEATURES}").split("\n")))))
   d.setVar('configmangle_append',
                  "/^### CROSS$/a\\\n%s\n" %
-                  ("\\n".join(["CONFIG_CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"",
-                              "CONFIG_EXTRA_CFLAGS=\"${CFLAGS}\" \"${HOST_CC_ARCH}\""
+                  ("\\n".join(["CONFIG_EXTRA_CFLAGS=\"${CFLAGS}\" \"${HOST_CC_ARCH}\""
                         ])
                   ))
 }