From ec8a40e231ce67bb5502b309afeac2a4fda34fd6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 11 Apr 2019 15:11:50 -0700 Subject: gcc-cross-canadian: Make baremetal specific code generic baremetal override is not valid for cross-canadian anymore therefore use the TARGET_OS overrides Fixes e.g. https://github.com/riscv/meta-riscv/issues/117 (From OE-Core rev: 1bc122a044de280d17525c8e5ee66e81775a7d8b) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'meta') diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index e7c08d3a61..807e47e0ee 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc @@ -159,10 +159,9 @@ SYSTEMLIBS = "${target_base_libdir}/" SYSTEMLIBS1 = "${target_libdir}/" EXTRA_OECONF += "--enable-poison-system-directories" - -EXTRA_OECONF_append_libc-baremetal = " --without-headers" -EXTRA_OECONF_remove_libc-baremetal = "--with-sysroot=/not/exist" -EXTRA_OECONF_remove_libc-baremetal = "--with-build-sysroot=${STAGING_DIR_TARGET}" - +EXTRA_OECONF_remove_elf = "--with-sysroot=/not/exist" +EXTRA_OECONF_remove_eabi = "--with-sysroot=/not/exist" +EXTRA_OECONF_append_elf = "--without-headers --with-newlib" +EXTRA_OECONF_append_eabi = "--without-headers --with-newlib" # gcc 4.7 needs -isystem export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir}" -- cgit v1.2.3-54-g00ecf