1 files changed, 17 insertions, 15 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index 23a6d4beb4..64196ee106 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -11,22 +11,24 @@ CROSS_TARGET_SYS_DIR_append = ".${PN}"
 # This is intended to be a -very- basic config
 # sysroot is needed in case we use libc-initial
-EXTRA_OECONF = "--with-newlib \
+EXTRA_OECONF = "\
-                --without-headers \
+    --with-newlib \
-                --disable-shared \
+    --without-headers \
-                --disable-threads \
+    --disable-shared \
-                --disable-multilib \
+    --disable-threads \
-                --disable-__cxa_atexit \
+    --disable-multilib \
-                --enable-languages=c \
+    --disable-__cxa_atexit \
-                ${OPTSPACE} \
+    --enable-languages=c \
-                --program-prefix=${TARGET_PREFIX} \
+    ${OPTSPACE} \
-                --with-sysroot=${STAGING_DIR_TARGET} \
+    --program-prefix=${TARGET_PREFIX} \
-                --with-build-sysroot=${GCCCROSS_BUILDSYSROOT} \
+    --with-sysroot=${STAGING_DIR_TARGET} \
-                ${EXTRA_OECONF_INITIAL} \
+    --with-build-sysroot=${GCCCROSS_BUILDSYSROOT} \
-                ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \
+    ${EXTRA_OECONF_INITIAL} \
-                ${EXTRA_OECONF_FPU}"
+    ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \
+    ${EXTRA_OECONF_FPU} \
+"
-EXTRA_OECONF += " --with-native-system-header-dir=${SYSTEMHEADERS} "
+EXTRA_OECONF += "--with-native-system-header-dir=${SYSTEMHEADERS}"
 GCCCROSS_BUILDSYSROOT = "${B}/tmpsysroot"

diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc index 23a6d4beb4..64196ee106 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -11,22 +11,24 @@ CROSS_TARGET_SYS_DIR_append = ".${PN}"
11		11
12	# This is intended to be a -very- basic config	12	# This is intended to be a -very- basic config
13	# sysroot is needed in case we use libc-initial	13	# sysroot is needed in case we use libc-initial
14	EXTRA_OECONF = "--with-newlib \	14	EXTRA_OECONF = "\
15	--without-headers \	15	--with-newlib \
16	--disable-shared \	16	--without-headers \
17	--disable-threads \	17	--disable-shared \
18	--disable-multilib \	18	--disable-threads \
19	--disable-__cxa_atexit \	19	--disable-multilib \
20	--enable-languages=c \	20	--disable-__cxa_atexit \
21	${OPTSPACE} \	21	--enable-languages=c \
22	--program-prefix=${TARGET_PREFIX} \	22	${OPTSPACE} \
23	--with-sysroot=${STAGING_DIR_TARGET} \	23	--program-prefix=${TARGET_PREFIX} \
24	--with-build-sysroot=${GCCCROSS_BUILDSYSROOT} \	24	--with-sysroot=${STAGING_DIR_TARGET} \
25	${EXTRA_OECONF_INITIAL} \	25	--with-build-sysroot=${GCCCROSS_BUILDSYSROOT} \
26	${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \	26	${EXTRA_OECONF_INITIAL} \
27	${EXTRA_OECONF_FPU}"	27	${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \
		28	${EXTRA_OECONF_FPU} \
		29	"
28		30
29	EXTRA_OECONF += " --with-native-system-header-dir=${SYSTEMHEADERS} "	31	EXTRA_OECONF += "--with-native-system-header-dir=${SYSTEMHEADERS}"
30		32
31	GCCCROSS_BUILDSYSROOT = "${B}/tmpsysroot"	33	GCCCROSS_BUILDSYSROOT = "${B}/tmpsysroot"
32		34