diff options
| -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 +} |