summaryrefslogtreecommitdiffstats
path: root/meta/classes/autotools.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-02 09:46:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-03 12:40:40 +0100
commit03af60ede97ecd67d17b9fdd9e958ad2b143f946 (patch)
tree34104725a3820860345b3613fea9fcf4876df94a /meta/classes/autotools.bbclass
parent34dc844fe0b25646697c311ec6ce92732c8b50ab (diff)
downloadpoky-03af60ede97ecd67d17b9fdd9e958ad2b143f946.tar.gz
sstate: Allow switching between linux and non-linux SDK builds within the same tmpdir
Currently if you try and switch between linux/darwin/mingw SDK builds in the same TMPDIR, things break. This is due to sstate not reflecting the SDK_OS in the manifest names. Since they are different, reflect this in the manifest naming and allow this to work. (From OE-Core rev: 7a0e1233ba196797f5f9bf862685dfae5511e751) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/autotools.bbclass')
-rw-r--r--meta/classes/autotools.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index c67896882d..2136504b8d 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -186,7 +186,7 @@ python autotools_copy_aclocals () {
186 if c.endswith("-native"): 186 if c.endswith("-native"):
187 manifest = d.expand("${SSTATE_MANIFESTS}/manifest-${BUILD_ARCH}-%s.populate_sysroot" % c) 187 manifest = d.expand("${SSTATE_MANIFESTS}/manifest-${BUILD_ARCH}-%s.populate_sysroot" % c)
188 elif c.startswith("nativesdk-"): 188 elif c.startswith("nativesdk-"):
189 manifest = d.expand("${SSTATE_MANIFESTS}/manifest-${SDK_ARCH}-%s.populate_sysroot" % c) 189 manifest = d.expand("${SSTATE_MANIFESTS}/manifest-${SDK_ARCH}_${SDK_OS}-%s.populate_sysroot" % c)
190 elif "-cross-" in c or "-crosssdk-" in c: 190 elif "-cross-" in c or "-crosssdk-" in c:
191 continue 191 continue
192 else: 192 else: