diff options
| -rw-r--r-- | meta/packages/gcc/gcc-configure-runtime.inc | 2 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc-package-cross.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/packages/gcc/gcc-configure-runtime.inc b/meta/packages/gcc/gcc-configure-runtime.inc index 9719e48ab5..96bf9e48e4 100644 --- a/meta/packages/gcc/gcc-configure-runtime.inc +++ b/meta/packages/gcc/gcc-configure-runtime.inc | |||
| @@ -33,7 +33,7 @@ do_compile () { | |||
| 33 | do_install () { | 33 | do_install () { |
| 34 | # Install libgcc from our gcc-cross saved data | 34 | # Install libgcc from our gcc-cross saved data |
| 35 | install -d ${D}${base_libdir} ${D}${libdir} | 35 | install -d ${D}${base_libdir} ${D}${libdir} |
| 36 | cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-${TARGET_SYS}/* ${D} | 36 | cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-${MULTIMACH_TARGET_SYS}/* ${D} |
| 37 | 37 | ||
| 38 | for d in ${RUNTIMETARGET}; do | 38 | for d in ${RUNTIMETARGET}; do |
| 39 | cd ${B}/$d/ | 39 | cd ${B}/$d/ |
diff --git a/meta/packages/gcc/gcc-package-cross.inc b/meta/packages/gcc/gcc-package-cross.inc index 8a170d083b..579daa163f 100644 --- a/meta/packages/gcc/gcc-package-cross.inc +++ b/meta/packages/gcc/gcc-package-cross.inc | |||
| @@ -18,7 +18,7 @@ do_install () { | |||
| 18 | 18 | ||
| 19 | # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build | 19 | # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build |
| 20 | if [ "${PN}" == "gcc-cross" -o "${PN}" == "gcc-crosssdk" ]; then | 20 | if [ "${PN}" == "gcc-cross" -o "${PN}" == "gcc-crosssdk" ]; then |
| 21 | dest=${D}/${includedir}/gcc-build-internal-${TARGET_SYS} | 21 | dest=${D}/${includedir}/gcc-build-internal-${MULTIMACH_TARGET_SYS} |
| 22 | oe_runmake "DESTDIR=$dest" libdir=${target_libdir} base_libdir=${target_base_libdir} prefix=${target_prefix} exec_prefix=${target_exec_prefix} install-target-libgcc | 22 | oe_runmake "DESTDIR=$dest" libdir=${target_libdir} base_libdir=${target_base_libdir} prefix=${target_prefix} exec_prefix=${target_exec_prefix} install-target-libgcc |
| 23 | 23 | ||
| 24 | # Ideally here we'd override the libgcc Makefile's idea of slibdir but | 24 | # Ideally here we'd override the libgcc Makefile's idea of slibdir but |
