diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-12-17 21:07:52 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-05-05 14:45:06 +0100 |
| commit | 851eb471cc5eb8c2fa0fe0077178dfb79eb38a00 (patch) | |
| tree | ccaddca8f4d0ec96af4142a1fdd884c92b2a0fd1 | |
| parent | 3fb59642b2b9afb7b8cd9769b53e24d85dc2f348 (diff) | |
gcc-cross: Convert to remove legacy staging functions
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | recipes/gcc/gcc-cross-initial.inc | 3 | ||||
| -rw-r--r-- | recipes/gcc/gcc-cross-intermediate.inc | 15 | ||||
| -rw-r--r-- | recipes/gcc/gcc-cross.inc | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/recipes/gcc/gcc-cross-initial.inc b/recipes/gcc/gcc-cross-initial.inc index 2ab1d7f990..abe82c693b 100644 --- a/recipes/gcc/gcc-cross-initial.inc +++ b/recipes/gcc/gcc-cross-initial.inc @@ -19,6 +19,3 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ ${@get_gcc_fpu_setting(bb, d)} \ ${@get_gcc_mips_plt_setting(bb, d)}" -do_install () { - : -} diff --git a/recipes/gcc/gcc-cross-intermediate.inc b/recipes/gcc/gcc-cross-intermediate.inc index 50792b697c..1ccf90233c 100644 --- a/recipes/gcc/gcc-cross-intermediate.inc +++ b/recipes/gcc/gcc-cross-intermediate.inc @@ -17,13 +17,12 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ ${@get_gcc_fpu_setting(bb, d)} \ ${@get_gcc_mips_plt_setting(bb, d)}" -do_stage_append () { - # get rid of dummy libc.so - if [ -z "`file ${STAGING_DIR_TARGET}${target_libdir}/libc.so | grep "ASCII C program text"`" ]; then - rm -rf ${STAGING_DIR_TARGET}${target_libdir}/libc.so - fi -} - do_install () { - : + oe_runmake 'DESTDIR=${D}' install + + # If this is important, we should remove the staging package here + # get rid of dummy libc.so + #if [ -z "`file ${STAGING_DIR_TARGET}${target_libdir}/libc.so | grep "ASCII C program text"`" ]; then + # rm -rf ${STAGING_DIR_TARGET}${target_libdir}/libc.so + #fi } diff --git a/recipes/gcc/gcc-cross.inc b/recipes/gcc/gcc-cross.inc index 19dc550319..2ba47fef5b 100644 --- a/recipes/gcc/gcc-cross.inc +++ b/recipes/gcc/gcc-cross.inc @@ -2,3 +2,7 @@ inherit cross DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" + +do_stage () { + use_do_install_for_stage +} |