summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/toolchain-scripts.bbclass6
-rw-r--r--meta/conf/bitbake.conf2
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index aa34b98b51..09ecd7ca47 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -27,7 +27,7 @@ toolchain_create_sdk_env_script () {
27 echo 'export LDFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script 27 echo 'export LDFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script
28 echo 'export CPPFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script 28 echo 'export CPPFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script
29 echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script 29 echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
30 echo 'export POKY_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script 30 echo 'export OECORE_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script
31 echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script 31 echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
32} 32}
33 33
@@ -58,7 +58,7 @@ toolchain_create_tree_env_script () {
58 echo 'export CFLAGS="${TARGET_CC_ARCH}"' >> $script 58 echo 'export CFLAGS="${TARGET_CC_ARCH}"' >> $script
59 echo 'export CXXFLAGS="${TARGET_CC_ARCH}"' >> $script 59 echo 'export CXXFLAGS="${TARGET_CC_ARCH}"' >> $script
60 echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script 60 echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script
61 echo 'export POKY_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script 61 echo 'export OECORE_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script
62} 62}
63 63
64# This function creates an environment-setup-script for use by the ADT installer 64# This function creates an environment-setup-script for use by the ADT installer
@@ -88,7 +88,7 @@ toolchain_create_sdk_env_script_for_installer () {
88 echo 'export LDFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script 88 echo 'export LDFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script
89 echo 'export CPPFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script 89 echo 'export CPPFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script
90 echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script 90 echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
91 echo 'export POKY_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script 91 echo 'export OECORE_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script
92 echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script 92 echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
93 echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script 93 echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script
94} 94}
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index c2927594b2..a0af672ae2 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -327,7 +327,7 @@ DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
327 327
328PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}" 328PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}"
329 329
330SDK_NAME = "${DISTRO}-${SDK_ARCH}-${TARGET_ARCH}" 330SDK_NAME = "oecore-${SDK_ARCH}-${TARGET_ARCH}"
331SDKPATH = "/usr/local/${SDK_NAME}" 331SDKPATH = "/usr/local/${SDK_NAME}"
332SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}" 332SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}"
333 333