diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-17 11:33:49 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-17 14:11:43 +0100 |
| commit | bcf83bb604906361db98003127b90c422e822322 (patch) | |
| tree | 0105df070c8bff182c3aafd902830d1f8089a2cc | |
| parent | 1ab0813c819d3b785178faa458486efa6992c636 (diff) | |
| download | openembedded-core-bcf83bb604906361db98003127b90c422e822322.tar.gz openembedded-core-bcf83bb604906361db98003127b90c422e822322.tar.bz2 openembedded-core-bcf83bb604906361db98003127b90c422e822322.zip | |
autotools: Remove .la files if rebuilding non out of tree software
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/autotools.bbclass | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 4e4ef986bf..883eb06e26 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -108,10 +108,16 @@ CONFIGURESTAMPFILE = "${WORKDIR}/configure.sstate" autotools_preconfigure() { if [ -n "${CONFIGURESTAMPFILE}" -a -e "${CONFIGURESTAMPFILE}" ]; then - if [ "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" -a "${S}" != "${B}" ]; then - echo "Previously configured separate build directory detected, cleaning ${B}" - rm -rf ${B} - mkdir ${B} + if [ "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" ]; then + if [ "${S}" != "${B}" ]; then + echo "Previously configured separate build directory detected, cleaning ${B}" + rm -rf ${B} + mkdir ${B} + else + # At least remove the .la files since automake won't automatically + # regenerate them even if CFLAGS/LDFLAGS are different + cd ${S}; find ${S} -name \*.la -delete + fi fi fi } |