summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-06-28 14:36:49 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-29 13:09:02 +0100
commitfc9492654aab2a6e3f46977193b5a5f388e4ee85 (patch)
treef0178b94b8e51a6a449371d1754f517a792a33f4 /meta
parent41db1bf69314e542a9d7ac1fb1b4bc65db75b642 (diff)
downloadopenembedded-core-fc9492654aab2a6e3f46977193b5a5f388e4ee85.tar.gz
openembedded-core-fc9492654aab2a6e3f46977193b5a5f388e4ee85.tar.bz2
openembedded-core-fc9492654aab2a6e3f46977193b5a5f388e4ee85.zip
gcc-configure-sdk, gcc-configure-cross: Dont recompute USE_NLS
This was needed because on eglibc based builds we did not define USE_NLS but now we define it in default config to have a valid value so we do not need this here. Moreover it was wrong and was not covering all cases of uclibc triplets Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-cross.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-sdk.inc4
2 files changed, 0 insertions, 6 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-configure-cross.inc b/meta/recipes-devtools/gcc/gcc-configure-cross.inc
index 3cb3452e63..243ee55d08 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-cross.inc
@@ -1,7 +1,5 @@
require gcc-configure-common.inc
-USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
-
EXTRA_OECONF += " --enable-poison-system-directories \
"
diff --git a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc b/meta/recipes-devtools/gcc/gcc-configure-sdk.inc
index 90e20f56c7..51c0217095 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-sdk.inc
@@ -1,9 +1,5 @@
require gcc-configure-common.inc
-# The two lines below conflict, this needs fixing - RP
-USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
-USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibceabi", "no", "", d )}'
-
EXTRA_OECONF_PATHS = "--with-gxx-include-dir=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}${target_includedir}/c++ \
--with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \
--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \