diff options
| author | Joshua Lock <josh@linux.intel.com> | 2010-04-28 13:59:36 +0100 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2010-04-28 16:47:14 +0100 |
| commit | 6458da896fffe33ab5db8cc2606e8225e16b0f36 (patch) | |
| tree | 340e8d6ec9c0ed64eb422ab8ffda18815b3ae474 /meta/packages/gcc/gcc-configure-sdk.inc | |
| parent | 29813a43b5c50bab571c3b593460c78aab65eac4 (diff) | |
| download | openembedded-core-6458da896fffe33ab5db8cc2606e8225e16b0f36.tar.gz openembedded-core-6458da896fffe33ab5db8cc2606e8225e16b0f36.tar.bz2 openembedded-core-6458da896fffe33ab5db8cc2606e8225e16b0f36.zip | |
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 <josh@linux.intel.com>
Diffstat (limited to 'meta/packages/gcc/gcc-configure-sdk.inc')
| -rw-r--r-- | meta/packages/gcc/gcc-configure-sdk.inc | 20 |
1 files changed, 10 insertions, 10 deletions
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 |