From 6458da896fffe33ab5db8cc2606e8225e16b0f36 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 28 Apr 2010 13:59:36 +0100 Subject: Fix references to CROSS_DIR now that it has been removed CROSS_DIR is no longer removed so fix up classes, packages and documentation which refer to it. Signed-off-by: Joshua Lock --- meta/packages/gcc/gcc-configure-sdk.inc | 20 ++++++++++---------- .../packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb | 2 +- .../gcc/gcc-cross-intermediate_csl-arm-2008q1.bb | 2 +- meta/packages/gcc/gcc-cross-kernel.inc | 2 +- meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb | 6 +++--- meta/packages/gcc/gcc-package-cross.inc | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) (limited to 'meta/packages/gcc') diff --git a/meta/packages/gcc/gcc-configure-sdk.inc b/meta/packages/gcc/gcc-configure-sdk.inc index 6738496219..3803902a58 100644 --- a/meta/packages/gcc/gcc-configure-sdk.inc +++ b/meta/packages/gcc/gcc-configure-sdk.inc @@ -6,7 +6,7 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ --with-gxx-include-dir=${prefix}/${TARGET_SYS}${target_includedir}/c++/${BINV}/ \ - --with-build-time-tools=${CROSS_DIR}/${TARGET_SYS}/bin \ + --with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \ --with-sysroot=${prefix}/${TARGET_SYS} \ --with-build-sysroot=${STAGING_DIR_TARGET}" @@ -14,18 +14,18 @@ EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} # gcc-cross looks and finds these in ${exec_prefix} but we're not so lucky # for the sdk. Hardcoding the paths ensures the build doesn't go canadian or worse. # -export AR_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/ar" -export AS_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/as" -export DLLTOOL_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/dlltool" +export AR_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/ar" +export AS_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/as" +export DLLTOOL_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/dlltool" export CC_FOR_TARGET = "${TARGET_SYS}-gcc" export CXX_FOR_TARGET = "${TARGET_SYS}-g++" export LD_FOR_TARGET = "${TARGET_SYS}-ld" -export LIPO_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/lipo" -export NM_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/nm" -export OBJDUMP_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/objdump" -export RANLIB_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/ranlib" -export STRIP_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/strip" -export WINDRES_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/windres" +export LIPO_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/lipo" +export NM_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/nm" +export OBJDUMP_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/objdump" +export RANLIB_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/ranlib" +export STRIP_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/strip" +export WINDRES_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/windres" # # We need to override this and make sure the compiler can find staging diff --git a/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb b/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb index a3664710f1..06211033b8 100644 --- a/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb +++ b/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb @@ -5,6 +5,6 @@ S = "${WORKDIR}/gcc-4.2" # Hack till we fix *libc properly do_install_append() { - ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/ + ln -sf ${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include/ } diff --git a/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb b/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb index b6d3a3a642..8a8f21a575 100644 --- a/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb +++ b/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb @@ -5,6 +5,6 @@ S = "${WORKDIR}/gcc-4.2" # Hack till we fix *libc properly do_install_append() { - ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/ + ln -sf ${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include/ } diff --git a/meta/packages/gcc/gcc-cross-kernel.inc b/meta/packages/gcc/gcc-cross-kernel.inc index c602d72514..02d44583c9 100644 --- a/meta/packages/gcc/gcc-cross-kernel.inc +++ b/meta/packages/gcc/gcc-cross-kernel.inc @@ -6,7 +6,7 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}" do_install () { cd gcc oe_runmake 'DESTDIR=${D}' install-common install-headers install-libgcc - install -m 0755 xgcc ${D}${CROSS_DIR}/bin/${TARGET_PREFIX}gcc-${PV} + install -m 0755 xgcc ${D}${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}gcc-${PV} } do_stage () { diff --git a/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb b/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb index a1581c2aa1..77f309c5a6 100644 --- a/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb +++ b/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb @@ -16,9 +16,9 @@ LDFLAGS = "" # staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain do_compile_prepend() { - ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ - ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ - ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/ sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure } diff --git a/meta/packages/gcc/gcc-package-cross.inc b/meta/packages/gcc/gcc-package-cross.inc index 04ae78a88b..449c8b548b 100644 --- a/meta/packages/gcc/gcc-package-cross.inc +++ b/meta/packages/gcc/gcc-package-cross.inc @@ -13,7 +13,7 @@ do_install () { # Remove things we don't need but keep share/java for d in info man share/doc share/locale share/man share/info; do - rm -rf ${D}${CROSS_DIR}/$d + rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/$d done # gcc-runtime requires some headers, we stash them here -- cgit v1.2.3-54-g00ecf