summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLianhao Lu <lianhao.lu@intel.com>2011-03-05 14:20:52 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-06 08:56:25 -0800
commitb43e5d302969fb0a21eb5b9f97e78797af00b9a2 (patch)
tree9c4447253eb766ff62f6a260caeeddc9ef44630f
parent2a285e69c247f4aa3594b8a8a33fb893b856392a (diff)
downloadpoky-b43e5d302969fb0a21eb5b9f97e78797af00b9a2.tar.gz
toolchain-script.bbclass: Added --sysroot to LDFLAGS.
[YOCTO #808] Added --sysroot to LDFALGS in environment files. (From OE-Core rev: a3a7aed9cca5765f106762cbcd9efbf4f1fccf9f) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/toolchain-scripts.bbclass2
-rw-r--r--meta/recipes-core/meta/meta-environment.bb2
-rw-r--r--meta/recipes-core/meta/meta-toolchain.bb2
3 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 2b9cfac6a1..998ff14b23 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -24,6 +24,7 @@ toolchain_create_sdk_env_script () {
24 fi 24 fi
25 echo 'export CFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script 25 echo 'export CFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script
26 echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script 26 echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script
27 echo 'export LDFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script
27 echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script 28 echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
28 echo 'export POKY_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script 29 echo 'export POKY_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script
29 echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script 30 echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
@@ -83,6 +84,7 @@ toolchain_create_sdk_env_script_for_installer () {
83 fi 84 fi
84 echo 'export CFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script 85 echo 'export CFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script
85 echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script 86 echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script
87 echo 'export LDFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script
86 echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script 88 echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
87 echo 'export POKY_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script 89 echo 'export POKY_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script
88 echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script 90 echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index 0b8826032b..d2dc5449df 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Package of environment files for SDK"
2LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 2LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
3 file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 3 file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
4LICENSE = "MIT" 4LICENSE = "MIT"
5PR = "r2" 5PR = "r3"
6 6
7EXCLUDE_FROM_WORLD = "1" 7EXCLUDE_FROM_WORLD = "1"
8 8
diff --git a/meta/recipes-core/meta/meta-toolchain.bb b/meta/recipes-core/meta/meta-toolchain.bb
index 2443b384a8..92936b6e76 100644
--- a/meta/recipes-core/meta/meta-toolchain.bb
+++ b/meta/recipes-core/meta/meta-toolchain.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "Meta package for building a installable toolchain" 1DESCRIPTION = "Meta package for building a installable toolchain"
2LICENSE = "MIT" 2LICENSE = "MIT"
3 3
4PR = "r2" 4PR = "r3"
5 5
6LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 6LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
7 file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 7 file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"