]> code.ossystems Code Review - openembedded-core.git/commitdiff
pseudo: Fix pseudo-native rebuild when triggered by dep change
authorMark Hatle <mark.hatle@windriver.com>
Fri, 17 Aug 2012 21:24:52 +0000 (16:24 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 19 Aug 2012 09:44:10 +0000 (10:44 +0100)
When NO32LIBS = 0, building 32-bit version of pseudo-native and
building on a 64-bit host -- if the build was triggered by a
dependency change on something pseudo uses, the build could fail
due to left over files from the previous build.  Fix this by
ensuring we run make distclean (and ignoring any failure codes) to
ensure we start over.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/recipes-devtools/pseudo/pseudo.inc

index ac898d2dd77b877b265680cda345a1de9f916b13..095e6e06d91dbb93978dbc15d45c2e36015b7cbe 100644 (file)
@@ -45,6 +45,12 @@ do_compile_prepend_virtclass-native () {
                # We need the 32-bit libpseudo on a 64-bit machine...
                 # ... and we really, really, hope that the native host is
                 # x86, or else --bits may not work.
+
+               # if we're being rebuilt due to a dependency change, we need to make sure
+               # everything is clean before we configure and build -- if we haven't previously
+               # built this will fail and be ignored.
+               make ${MAKEOPTS} distclean || :
+
                ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath
                oe_runmake ${MAKEOPTS} libpseudo
                # prevent it from removing the lib, but remove everything else