diff options
| -rw-r--r-- | meta/classes/toolchain-scripts.bbclass | 2 | ||||
| -rw-r--r-- | meta/recipes-core/meta/meta-environment.bb | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index a5b2bd129b..5ec0e8a4a9 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass @@ -84,7 +84,7 @@ toolchain_create_sdk_env_script_for_installer () { ln -s /usr/local local fi echo 'export CFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script - echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT## -I##SDKTARGETSYSROOT##${GXX_INCLUDEDIR}"' >> $script + echo 'export CXXFLAGS="${TARGET_CC_ARCH} --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 da8d6612c9..e5a63141cc 100644 --- a/meta/recipes-core/meta/meta-environment.bb +++ b/meta/recipes-core/meta/meta-environment.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Packge of environment files for SDK" LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" LICENSE = "MIT" -PR = "r0" +PR = "r1" EXCLUDE_FROM_WORLD = "1" @@ -16,8 +16,6 @@ SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${TARGET_SYS}" inherit cross-canadian -GXX_INCLUDEDIR := "${target_includedir}/c++" - do_generate_content[nostamp] = "1" do_generate_content() { |