diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-24 15:24:09 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-25 17:10:57 +0100 |
| commit | 8a2aaf8b6bdca2d28c0047093c7f668750d57666 (patch) | |
| tree | 87a370bf464de12c644b6a43932aaae5ecda89a9 /meta/recipes-devtools/gcc | |
| parent | 459e4dc25462771038459567c22e87d4cd38b117 (diff) | |
| download | openembedded-core-contrib-8a2aaf8b6bdca2d28c0047093c7f668750d57666.tar.gz | |
gcc-cross-initial: Separate out libgcc-initial
Its useful to separate out the native (cross) binaries from the target
compilation. We already do this for libgcc, this now takes the same
approach for -initial.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-initial.inc | 13 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/libgcc-initial.inc | 16 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/libgcc-initial_4.8.bb | 2 |
3 files changed, 29 insertions, 2 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc index 81845386f9..3870168863 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc @@ -38,10 +38,11 @@ do_configure_prepend () { } do_compile () { - oe_runmake all-gcc all-target-libgcc + oe_runmake all-gcc configure-target-libgcc } do_install () { - oe_runmake 'DESTDIR=${D}' install-gcc install-target-libgcc + ( cd ${B}/${TARGET_SYS}/libgcc; oe_runmake 'DESTDIR=${D}' install-unwind_h ) + oe_runmake 'DESTDIR=${D}' install-gcc # We don't really need this (here shares/ contains man/, info/, locale/). rm -rf ${D}${datadir}/ @@ -64,6 +65,14 @@ do_install () { # so we overwirte the generated include-fixed/limits.h for gcc-cross-initial # to get rid references to real limits.h cp gcc/include-fixed/limits.h ${D}${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed/limits.h + + # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build + case ${PN} in + *gcc-cross-initial|*gcc-crosssdk-initial) + dest=${D}/${includedir}/gcc-build-internal-initial-${MULTIMACH_TARGET_SYS} + hardlinkdir . $dest + ;; + esac } # # Override the default sysroot staging copy since this won't look like a target system diff --git a/meta/recipes-devtools/gcc/libgcc-initial.inc b/meta/recipes-devtools/gcc/libgcc-initial.inc new file mode 100644 index 0000000000..2ba27a81d8 --- /dev/null +++ b/meta/recipes-devtools/gcc/libgcc-initial.inc @@ -0,0 +1,16 @@ +require libgcc-common.inc + +DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial" + +STAGINGCC = "gcc-cross-initial" +STAGINGCC_class-nativesdk = "gcc-crosssdk-initial" +PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" + +PACKAGES = "" + +EXTRA_OECONF += "--disable-shared" + +LIBGCCBUILDTREENAME = "gcc-build-internal-initial-" + +do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}/" + diff --git a/meta/recipes-devtools/gcc/libgcc-initial_4.8.bb b/meta/recipes-devtools/gcc/libgcc-initial_4.8.bb new file mode 100644 index 0000000000..19f253fce8 --- /dev/null +++ b/meta/recipes-devtools/gcc/libgcc-initial_4.8.bb @@ -0,0 +1,2 @@ +require recipes-devtools/gcc/gcc-${PV}.inc +require libgcc-initial.inc |