diff mbox series

[oe,meta-initramfs,4/5] klibc.bbclass: Use forcevariable override to define flags

Message ID 20170911151056.4577-4-raj.khem@gmail.com
State Superseded
Headers show
Series [oe,meta-initramfs,1/5] klibc: Edit out gcc hardcoding in do_compile | expand

Commit Message

Khem Raj Sept. 11, 2017, 3:10 p.m. UTC
This is required so it can override the CC settings when
clang is used because meta-clang uses toolchain-clang
override to set CC and friends so we need to use higher
order override, forcevariable is highest order.

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 meta-initramfs/classes/klibc.bbclass | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

-- 
2.14.1

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Comments

Andre McCurdy Sept. 11, 2017, 6:47 p.m. UTC | #1
On Mon, Sep 11, 2017 at 8:10 AM, Khem Raj <raj.khem@gmail.com> wrote:
> This is required so it can override the CC settings when

> clang is used because meta-clang uses toolchain-clang

> override to set CC and friends so we need to use higher

> order override, forcevariable is highest order.


Just for reference, ${LIBCOVERRIDE} is the highest order over-ride,
forcevariable is second.

> Signed-off-by: Khem Raj <raj.khem@gmail.com>

> ---

>  meta-initramfs/classes/klibc.bbclass | 13 ++++++-------

>  1 file changed, 6 insertions(+), 7 deletions(-)

>

> diff --git a/meta-initramfs/classes/klibc.bbclass b/meta-initramfs/classes/klibc.bbclass

> index f864104cf..2aacf241e 100644

> --- a/meta-initramfs/classes/klibc.bbclass

> +++ b/meta-initramfs/classes/klibc.bbclass

> @@ -3,13 +3,12 @@ DEPENDS =+ "klcc-cross"

>

>  # Default for klcc is to build static binaries.

>  # Set CC = "${TARGET_PREFIX}klcc -shared" to build the dynamic version.

> +CC_forcevariable = "${TARGET_PREFIX}klcc ${TOOLCHAIN_OPTIONS}"

> +CC_forcevariable_armv4_linux-gnueabi = "${TARGET_PREFIX}klcc ${TOOLCHAIN_OPTIONS} -march=armv4 -mthumb-interwork"

>

> -export CC = "${TARGET_PREFIX}klcc ${TOOLCHAIN_OPTIONS}"

> -export CC_armv4_linux-gnueabi = "${TARGET_PREFIX}klcc ${TOOLCHAIN_OPTIONS} -march=armv4 -mthumb-interwork"

> -

> -export CPP = "${CC} -E"

> +CPP_forcevariable = "${CC} -E"

>

>  # klcc uses own optimizations by default. See klcc(1) man file.

> -export CFLAGS=""

> -export CPPFLAGS=""

> -export LDFLAGS=""

> +CFLAGS_forcevariable=""

> +CPPFLAGS_forcevariable=""

> +LDFLAGS_forcevariable=""

> --

> 2.14.1

>

> --

> _______________________________________________

> Openembedded-devel mailing list

> Openembedded-devel@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Martin Jansa Sept. 12, 2017, 6:59 p.m. UTC | #2
One of these last changes seems to cause:

http://errors.yoctoproject.org/Errors/Details/155766/

On Mon, Sep 11, 2017 at 8:47 PM, Andre McCurdy <armccurdy@gmail.com> wrote:

> On Mon, Sep 11, 2017 at 8:10 AM, Khem Raj <raj.khem@gmail.com> wrote:

> > This is required so it can override the CC settings when

> > clang is used because meta-clang uses toolchain-clang

> > override to set CC and friends so we need to use higher

> > order override, forcevariable is highest order.

>

> Just for reference, ${LIBCOVERRIDE} is the highest order over-ride,

> forcevariable is second.

>

> > Signed-off-by: Khem Raj <raj.khem@gmail.com>

> > ---

> >  meta-initramfs/classes/klibc.bbclass | 13 ++++++-------

> >  1 file changed, 6 insertions(+), 7 deletions(-)

> >

> > diff --git a/meta-initramfs/classes/klibc.bbclass

> b/meta-initramfs/classes/klibc.bbclass

> > index f864104cf..2aacf241e 100644

> > --- a/meta-initramfs/classes/klibc.bbclass

> > +++ b/meta-initramfs/classes/klibc.bbclass

> > @@ -3,13 +3,12 @@ DEPENDS =+ "klcc-cross"

> >

> >  # Default for klcc is to build static binaries.

> >  # Set CC = "${TARGET_PREFIX}klcc -shared" to build the dynamic version.

> > +CC_forcevariable = "${TARGET_PREFIX}klcc ${TOOLCHAIN_OPTIONS}"

> > +CC_forcevariable_armv4_linux-gnueabi = "${TARGET_PREFIX}klcc

> ${TOOLCHAIN_OPTIONS} -march=armv4 -mthumb-interwork"

> >

> > -export CC = "${TARGET_PREFIX}klcc ${TOOLCHAIN_OPTIONS}"

> > -export CC_armv4_linux-gnueabi = "${TARGET_PREFIX}klcc

> ${TOOLCHAIN_OPTIONS} -march=armv4 -mthumb-interwork"

> > -

> > -export CPP = "${CC} -E"

> > +CPP_forcevariable = "${CC} -E"

> >

> >  # klcc uses own optimizations by default. See klcc(1) man file.

> > -export CFLAGS=""

> > -export CPPFLAGS=""

> > -export LDFLAGS=""

> > +CFLAGS_forcevariable=""

> > +CPPFLAGS_forcevariable=""

> > +LDFLAGS_forcevariable=""

> > --

> > 2.14.1

> >

> > --

> > _______________________________________________

> > Openembedded-devel mailing list

> > Openembedded-devel@lists.openembedded.org

> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel

> --

> _______________________________________________

> Openembedded-devel mailing list

> Openembedded-devel@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

>

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
diff mbox series

Patch

diff --git a/meta-initramfs/classes/klibc.bbclass b/meta-initramfs/classes/klibc.bbclass
index f864104cf..2aacf241e 100644
--- a/meta-initramfs/classes/klibc.bbclass
+++ b/meta-initramfs/classes/klibc.bbclass
@@ -3,13 +3,12 @@  DEPENDS =+ "klcc-cross"
 
 # Default for klcc is to build static binaries.
 # Set CC = "${TARGET_PREFIX}klcc -shared" to build the dynamic version.
+CC_forcevariable = "${TARGET_PREFIX}klcc ${TOOLCHAIN_OPTIONS}"
+CC_forcevariable_armv4_linux-gnueabi = "${TARGET_PREFIX}klcc ${TOOLCHAIN_OPTIONS} -march=armv4 -mthumb-interwork"
 
-export CC = "${TARGET_PREFIX}klcc ${TOOLCHAIN_OPTIONS}"
-export CC_armv4_linux-gnueabi = "${TARGET_PREFIX}klcc ${TOOLCHAIN_OPTIONS} -march=armv4 -mthumb-interwork"
-
-export CPP = "${CC} -E"
+CPP_forcevariable = "${CC} -E"
 
 # klcc uses own optimizations by default. See klcc(1) man file.
-export CFLAGS=""
-export CPPFLAGS=""
-export LDFLAGS=""
+CFLAGS_forcevariable=""
+CPPFLAGS_forcevariable=""
+LDFLAGS_forcevariable=""