1 files changed, 12 insertions, 12 deletions
diff --git a/meta/packages/gcc/gcc-configure-sdk.inc b/meta/packages/gcc/gcc-configure-sdk.inc
index 3b3f1f8047..0eb33adda8 100644
--- a/meta/packages/gcc/gcc-configure-sdk.inc
+++ b/meta/packages/gcc/gcc-configure-sdk.inc
@@ -14,18 +14,18 @@ EXTRA_OECONF_PATHS = "--with-local-prefix=${SDKPATH}/sysroots/${TARGET_SYS}${tar
 # 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 = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/ar"
+export AR_FOR_TARGET = "${TARGET_PREFIX}ar"
-export AS_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/as"
+export AS_FOR_TARGET = "${TARGET_PREFIX}as"
-export DLLTOOL_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/dlltool"
+export DLLTOOL_FOR_TARGET = "${TARGET_PREFIX}dlltool"
-export CC_FOR_TARGET = "${TARGET_SYS}-gcc"
+export CC_FOR_TARGET = "${TARGET_PREFIX}gcc"
-export CXX_FOR_TARGET = "${TARGET_SYS}-g++"
+export CXX_FOR_TARGET = "${TARGET_PREFIX}g++"
-export LD_FOR_TARGET = "${TARGET_SYS}-ld"
+export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
-export LIPO_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/lipo"
+export LIPO_FOR_TARGET = "${TARGET_PREFIX}lipo"
-export NM_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/nm"
+export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
-export OBJDUMP_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/objdump"
+export OBJDUMP_FOR_TARGET = "${TARGET_PREFIX}objdump"
-export RANLIB_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/ranlib"
+export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
-export STRIP_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/strip"
+export STRIP_FOR_TARGET = "${TARGET_PREFIX}strip"
-export WINDRES_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/windres"
+export WINDRES_FOR_TARGET = "${TARGET_PREFIX}windres"
 #
 # We need to override this and make sure the compiler can find staging

diff --git a/meta/packages/gcc/gcc-configure-sdk.inc b/meta/packages/gcc/gcc-configure-sdk.inc index 3b3f1f8047..0eb33adda8 100644 --- a/meta/packages/gcc/gcc-configure-sdk.inc +++ b/meta/packages/gcc/gcc-configure-sdk.inc
@@ -14,18 +14,18 @@ EXTRA_OECONF_PATHS = "--with-local-prefix=${SDKPATH}/sysroots/${TARGET_SYS}${tar
14	# gcc-cross looks and finds these in ${exec_prefix} but we're not so lucky	14	# gcc-cross looks and finds these in ${exec_prefix} but we're not so lucky
15	# for the sdk. Hardcoding the paths ensures the build doesn't go canadian or worse.	15	# for the sdk. Hardcoding the paths ensures the build doesn't go canadian or worse.
16	#	16	#
17	export AR_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/ar"	17	export AR_FOR_TARGET = "${TARGET_PREFIX}ar"
18	export AS_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/as"	18	export AS_FOR_TARGET = "${TARGET_PREFIX}as"
19	export DLLTOOL_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/dlltool"	19	export DLLTOOL_FOR_TARGET = "${TARGET_PREFIX}dlltool"
20	export CC_FOR_TARGET = "${TARGET_SYS}-gcc"	20	export CC_FOR_TARGET = "${TARGET_PREFIX}gcc"
21	export CXX_FOR_TARGET = "${TARGET_SYS}-g++"	21	export CXX_FOR_TARGET = "${TARGET_PREFIX}g++"
22	export LD_FOR_TARGET = "${TARGET_SYS}-ld"	22	export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
23	export LIPO_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/lipo"	23	export LIPO_FOR_TARGET = "${TARGET_PREFIX}lipo"
24	export NM_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/nm"	24	export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
25	export OBJDUMP_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/objdump"	25	export OBJDUMP_FOR_TARGET = "${TARGET_PREFIX}objdump"
26	export RANLIB_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/ranlib"	26	export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
27	export STRIP_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/strip"	27	export STRIP_FOR_TARGET = "${TARGET_PREFIX}strip"
28	export WINDRES_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/windres"	28	export WINDRES_FOR_TARGET = "${TARGET_PREFIX}windres"
29		29
30	#	30	#
31	# We need to override this and make sure the compiler can find staging	31	# We need to override this and make sure the compiler can find staging