summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc/libgcc-common.inc
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-24 13:18:12 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-26 10:44:27 +0000
commit42ed1d8ac9799e41544c2da93069ecc6f86cbded (patch)
tree0a67a6c18c1964c048c8a821fddf7da7de506c95 /meta/recipes-devtools/gcc/libgcc-common.inc
parent1cec0f3bf4fa784e91ee4cdb66376361ecbff18e (diff)
downloadpoky-42ed1d8ac9799e41544c2da93069ecc6f86cbded.tar.gz
gcc: Split builddir saving into its own sstate task
When we stashed the gcc build directory for use in generating the various runtimes we were being lazy and just used the staging directory. With recipe specific sysroots this means we're copying a large chunk of data around with the cross compiler which we don't really need in most cases. Separate out the data into its own task and inject this into the configure step. We have to do that here since autotools will wipe out ${B} if it thinks we're rebuilding and we therefore have to time its recreation after that. This also takes the opportunity to remove some pointless (as far as I can tell) conditionals from the do_install code. (From OE-Core rev: dcf15ccf3cc9d55e77228ba8d526f967fc9791b4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/libgcc-common.inc')
-rw-r--r--meta/recipes-devtools/gcc/libgcc-common.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc b/meta/recipes-devtools/gcc/libgcc-common.inc
index 7a3b4106a8..c0efc29437 100644
--- a/meta/recipes-devtools/gcc/libgcc-common.inc
+++ b/meta/recipes-devtools/gcc/libgcc-common.inc
@@ -7,7 +7,6 @@ INHIBIT_DEFAULT_DEPS = "1"
7do_configure () { 7do_configure () {
8 target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` 8 target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
9 install -d ${D}${base_libdir} ${D}${libdir} 9 install -d ${D}${base_libdir} ${D}${libdir}
10 hardlinkdir ${STAGING_INCDIR_NATIVE}/${LIBGCCBUILDTREENAME}$target/ ${B}
11 mkdir -p ${B}/${BPN} 10 mkdir -p ${B}/${BPN}
12 mkdir -p ${B}/$target/${BPN}/ 11 mkdir -p ${B}/$target/${BPN}/
13 cd ${B}/${BPN} 12 cd ${B}/${BPN}
@@ -15,6 +14,8 @@ do_configure () {
15 relpath=${@os.path.relpath("${S}/${BPN}", "${B}/${BPN}")} 14 relpath=${@os.path.relpath("${S}/${BPN}", "${B}/${BPN}")}
16 $relpath/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} 15 $relpath/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
17} 16}
17EXTRACONFFUNCS += "extract_stashed_builddir"
18do_configure[depends] += "${COMPILERDEP}"
18 19
19do_compile () { 20do_compile () {
20 target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` 21 target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`