summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2014-06-24 19:28:06 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-25 13:51:47 +0100
commite110809a52f0ccfd757e5eaab55a59b22528e3f4 (patch)
tree0a2e19cc79b438c0c72f2991445cfe8a11bfd9f8
parentd9cdeac6d7469aae22c89d2623d07005e5e265f9 (diff)
downloadpoky-e110809a52f0ccfd757e5eaab55a59b22528e3f4.tar.gz
gcc-cross-canadian: Add configure-target-libgcc
While we're not going to package the libgcc component as part of the SDK, we do need to generate it to get the unwind, and quadmath headers. Without this change it is not possible to build eglibc or other components that require these headers with the SDK toolchain. (From OE-Core rev: e67b24401a366b20644510703c7140be975869ea) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian.inc13
1 files changed, 10 insertions, 3 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index 307f73c8ed..63adae8386 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -58,7 +58,7 @@ do_configure () {
58} 58}
59 59
60do_compile () { 60do_compile () {
61 oe_runmake all-host 61 oe_runmake all-host configure-target-libgcc
62} 62}
63 63
64INHIBIT_PACKAGE_STRIP = "1" 64INHIBIT_PACKAGE_STRIP = "1"
@@ -97,6 +97,7 @@ EXEEXT = ""
97BINRELPATH = "${@os.path.relpath(d.expand("${bindir}"), d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"))}" 97BINRELPATH = "${@os.path.relpath(d.expand("${bindir}"), d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"))}"
98 98
99do_install () { 99do_install () {
100 ( cd ${B}/${TARGET_SYS}/libgcc; oe_runmake 'DESTDIR=${D}' install-unwind_h )
100 oe_runmake 'DESTDIR=${D}' install-host 101 oe_runmake 'DESTDIR=${D}' install-host
101 102
102 # Cleanup some of the ${libdir}{,exec}/gcc stuff ... 103 # Cleanup some of the ${libdir}{,exec}/gcc stuff ...
@@ -137,6 +138,11 @@ do_install () {
137 ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t$suffix $dest$t$suffix 138 ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t$suffix $dest$t$suffix
138 done 139 done
139 140
141 # libquadmath headers need to be available in the gcc libexec dir
142 install -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
143 cp ${S}/libquadmath/quadmath.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
144 cp ${S}/libquadmath/quadmath_weak.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
145
140 chown -R root:root ${D} 146 chown -R root:root ${D}
141 147
142 cross_canadian_bindirlinks 148 cross_canadian_bindirlinks
@@ -150,8 +156,9 @@ SYSTEMHEADERS = "/usr/include"
150SYSTEMLIBS = "${target_base_libdir}/" 156SYSTEMLIBS = "${target_base_libdir}/"
151SYSTEMLIBS1 = "${target_libdir}/" 157SYSTEMLIBS1 = "${target_libdir}/"
152 158
153EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ 159EXTRA_OECONF += " --enable-poison-system-directories"
154 --disable-libgomp --disable-libmudflap \ 160
161EXTRA_OECONF += "--disable-libunwind-exceptions \
155 --with-mpfr=${STAGING_DIR_HOST}${layout_exec_prefix} \ 162 --with-mpfr=${STAGING_DIR_HOST}${layout_exec_prefix} \
156 --with-mpc=${STAGING_DIR_HOST}${layout_exec_prefix}" 163 --with-mpc=${STAGING_DIR_HOST}${layout_exec_prefix}"
157 164