toolchain-script.bbclass: Added --sysroot to LDFLAGS.

[YOCTO #808] Added --sysroot to LDFALGS in environment files.

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 2b9cfac6a190f99c8ce2358230d852f52670b92e..998ff14b2377c006f3d411a600d93a7aa167d446 100644 (file)
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -24,6 +24,7 @@ toolchain_create_sdk_env_script () {
        fi
        echo 'export CFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script
        echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script
+       echo 'export LDFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script
        echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
        echo 'export POKY_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script
        echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
@@ -83,6 +84,7 @@ toolchain_create_sdk_env_script_for_installer () {
        fi
        echo 'export CFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script
        echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script
+       echo 'export LDFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script
        echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
        echo 'export POKY_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script
        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 0b8826032b377387a7efb28f9a9786b09bce9142..d2dc5449dff75cbb3b525dda0792ac8d2bd8b43a 100644 (file)
--- 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"
 LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 LICENSE = "MIT"
-PR = "r2"
+PR = "r3"
 
 EXCLUDE_FROM_WORLD = "1"
 

diff --git a/meta/recipes-core/meta/meta-toolchain.bb b/meta/recipes-core/meta/meta-toolchain.bb
index 2443b384a89b465a60179dadb18302298e2fab52..92936b6e76d43d8662c5a1b5a8f49fcd1ce2e15d 100644 (file)
--- a/meta/recipes-core/meta/meta-toolchain.bb
+++ b/meta/recipes-core/meta/meta-toolchain.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta package for building a installable toolchain"
 LICENSE = "MIT"
 
-PR = "r2"
+PR = "r3"
 
 LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"