diff options
Diffstat (limited to 'meta/classes/toolchain-scripts.bbclass')
-rw-r--r-- | meta/classes/toolchain-scripts.bbclass | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index 711efd39ab..2099c4def8 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass | |||
@@ -105,7 +105,7 @@ toolchain_create_sdk_env_script_for_installer () { | |||
105 | #we get the cached site config in the runtime | 105 | #we get the cached site config in the runtime |
106 | TOOLCHAIN_CONFIGSITE_NOCACHE := "${@siteinfo_get_files(d, True)}" | 106 | TOOLCHAIN_CONFIGSITE_NOCACHE := "${@siteinfo_get_files(d, True)}" |
107 | TOOLCHAIN_CONFIGSITE_SYSROOTCACHE := "${STAGING_DATADIR}/${TARGET_SYS}_config_site.d" | 107 | TOOLCHAIN_CONFIGSITE_SYSROOTCACHE := "${STAGING_DATADIR}/${TARGET_SYS}_config_site.d" |
108 | TOOLCHAIN_NEED_CONFIGSITE_CACHE = "ncurses" | 108 | TOOLCHAIN_NEED_CONFIGSITE_CACHE = "${TCLIBC} ncurses" |
109 | 109 | ||
110 | #This function create a site config file | 110 | #This function create a site config file |
111 | toolchain_create_sdk_siteconfig () { | 111 | toolchain_create_sdk_siteconfig () { |
@@ -113,9 +113,7 @@ toolchain_create_sdk_siteconfig () { | |||
113 | 113 | ||
114 | rm -f $siteconfig | 114 | rm -f $siteconfig |
115 | touch $siteconfig | 115 | touch $siteconfig |
116 | if [ "${LIBC}" = "eglibc" ]; then | 116 | |
117 | TOOLCHAIN_NEED_CONFIGSITE_CACHE = "${TOOLCHAIN_NEED_CONFIGSITE_CACHE} eglibc" | ||
118 | fi | ||
119 | for sitefile in ${TOOLCHAIN_CONFIGSITE_NOCACHE} ; do | 117 | for sitefile in ${TOOLCHAIN_CONFIGSITE_NOCACHE} ; do |
120 | cat $sitefile >> $siteconfig | 118 | cat $sitefile >> $siteconfig |
121 | done | 119 | done |
@@ -146,7 +144,5 @@ python __anonymous () { | |||
146 | deps = "" | 144 | deps = "" |
147 | for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE', True) or "").split(): | 145 | for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE', True) or "").split(): |
148 | deps += " %s:do_populate_sysroot" % dep | 146 | deps += " %s:do_populate_sysroot" % dep |
149 | if d.getVar('TCLIBC', True) is "uclibc": | ||
150 | deps += "uclibc:do_populate_sysroot" | ||
151 | d.appendVarFlag('do_configure', 'depends', deps) | 147 | d.appendVarFlag('do_configure', 'depends', deps) |
152 | } | 148 | } |