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

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

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>

diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 998ff14b2377c006f3d411a600d93a7aa167d446..ef21784b98ad4f281305cae209231c0e658cc6f1 100644 (file)
--- 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 d2dc5449dff75cbb3b525dda0792ac8d2bd8b43a..b20068fc51d4e1c197dfc7dd2e7dc8f3c93dcfcc 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 = "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 92936b6e76d43d8662c5a1b5a8f49fcd1ce2e15d..7a241da4d01bf6a66bfad959584c0bb08296042e 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 = "r3"
+PR = "r4"
 
 LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"