diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-23 14:35:37 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-23 17:58:00 +0100 |
| commit | 989d2f794f9fad2af311cea0e2957acd4d6236b0 (patch) | |
| tree | 00fd59c6946fdba12b8e3ea6e3154ab6a0412c02 /meta/packages/gcc | |
| parent | 3f5d3d7b99c3d7775d74a955aef814b78c1d0f80 (diff) | |
| download | openembedded-core-989d2f794f9fad2af311cea0e2957acd4d6236b0.tar.gz openembedded-core-989d2f794f9fad2af311cea0e2957acd4d6236b0.tar.bz2 openembedded-core-989d2f794f9fad2af311cea0e2957acd4d6236b0.zip | |
gcc-cross: Use MULTIMACH_TARGET_SYS instead of TARGET_SYS in staging path
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/gcc')
| -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 () { do_install () { # Install libgcc from our gcc-cross saved data install -d ${D}${base_libdir} ${D}${libdir} - cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-${TARGET_SYS}/* ${D} + cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-${MULTIMACH_TARGET_SYS}/* ${D} for d in ${RUNTIMETARGET}; do 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 () { # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build if [ "${PN}" == "gcc-cross" -o "${PN}" == "gcc-crosssdk" ]; then - dest=${D}/${includedir}/gcc-build-internal-${TARGET_SYS} + dest=${D}/${includedir}/gcc-build-internal-${MULTIMACH_TARGET_SYS} oe_runmake "DESTDIR=$dest" libdir=${target_libdir} base_libdir=${target_base_libdir} prefix=${target_prefix} exec_prefix=${target_exec_prefix} install-target-libgcc # Ideally here we'd override the libgcc Makefile's idea of slibdir but |