toolchain-scripts.bbclass: Added --sysroot to CPPFLAGS.

[YOCTO #908] Added CPPFLAGS into the environment file and added
--sysroot to it.

(From OE-Core rev: 360daf019101d9b4d08ab1e3d279b08c02e9749e)

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 4 insertions, 2 deletions

diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 998ff14b23..ef21784b98 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -25,6 +25,7 @@ toolchain_create_sdk_env_script () {
         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 CPPFLAGS="--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
@@ -85,6 +86,7 @@ toolchain_create_sdk_env_script_for_installer () {
         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 CPPFLAGS="--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 d2dc5449df..b20068fc51 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"
 LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 LICENSE = "MIT"
-PR = "r3"
+PR = "r4"
 
 EXCLUDE_FROM_WORLD = "1"
 
diff --git a/meta/recipes-core/meta/meta-toolchain.bb b/meta/recipes-core/meta/meta-toolchain.bb
index 92936b6e76..7a241da4d0 100644
--- 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 = "r3"
+PR = "r4"
 
 LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"