diff options
Diffstat (limited to 'meta/classes/toolchain-scripts.bbclass')
-rw-r--r-- | meta/classes/toolchain-scripts.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index 479f3b706e..fb6261c91d 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass | |||
@@ -65,6 +65,7 @@ toolchain_create_sdk_env_script () { | |||
65 | 65 | ||
66 | # This function creates an environment-setup-script in the TMPDIR which enables | 66 | # This function creates an environment-setup-script in the TMPDIR which enables |
67 | # a OE-core IDE to integrate with the build tree | 67 | # a OE-core IDE to integrate with the build tree |
68 | # Caller must ensure CONFIG_SITE is setup | ||
68 | toolchain_create_tree_env_script () { | 69 | toolchain_create_tree_env_script () { |
69 | script=${TMPDIR}/environment-setup-${REAL_MULTIMACH_TARGET_SYS} | 70 | script=${TMPDIR}/environment-setup-${REAL_MULTIMACH_TARGET_SYS} |
70 | rm -f $script | 71 | rm -f $script |
@@ -73,7 +74,7 @@ toolchain_create_tree_env_script () { | |||
73 | echo 'export PATH=${STAGING_DIR_NATIVE}/usr/bin:${STAGING_BINDIR_TOOLCHAIN}:$PATH' >> $script | 74 | echo 'export PATH=${STAGING_DIR_NATIVE}/usr/bin:${STAGING_BINDIR_TOOLCHAIN}:$PATH' >> $script |
74 | echo 'export PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR}' >> $script | 75 | echo 'export PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR}' >> $script |
75 | echo 'export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}' >> $script | 76 | echo 'export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}' >> $script |
76 | echo 'export CONFIG_SITE="${@siteinfo_get_files(d)}"' >> $script | 77 | echo 'export CONFIG_SITE="${CONFIG_SITE}"' >> $script |
77 | echo 'export SDKTARGETSYSROOT=${STAGING_DIR_TARGET}' >> $script | 78 | echo 'export SDKTARGETSYSROOT=${STAGING_DIR_TARGET}' >> $script |
78 | echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script | 79 | echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script |
79 | echo 'export OECORE_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script | 80 | echo 'export OECORE_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script |
@@ -161,7 +162,7 @@ EOF | |||
161 | } | 162 | } |
162 | 163 | ||
163 | #we get the cached site config in the runtime | 164 | #we get the cached site config in the runtime |
164 | TOOLCHAIN_CONFIGSITE_NOCACHE = "${@siteinfo_get_files(d)}" | 165 | TOOLCHAIN_CONFIGSITE_NOCACHE = "${@' '.join(siteinfo_get_files(d)[0])}" |
165 | TOOLCHAIN_CONFIGSITE_SYSROOTCACHE = "${STAGING_DIR}/${MLPREFIX}${MACHINE}/${target_datadir}/${TARGET_SYS}_config_site.d" | 166 | TOOLCHAIN_CONFIGSITE_SYSROOTCACHE = "${STAGING_DIR}/${MLPREFIX}${MACHINE}/${target_datadir}/${TARGET_SYS}_config_site.d" |
166 | TOOLCHAIN_NEED_CONFIGSITE_CACHE ??= "virtual/${MLPREFIX}libc ncurses" | 167 | TOOLCHAIN_NEED_CONFIGSITE_CACHE ??= "virtual/${MLPREFIX}libc ncurses" |
167 | DEPENDS += "${TOOLCHAIN_NEED_CONFIGSITE_CACHE}" | 168 | DEPENDS += "${TOOLCHAIN_NEED_CONFIGSITE_CACHE}" |