[oe-commits] [openembedded-core] 01/06: cmake.bbclass: fix wrong toolchain flags of nativesdk package

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 1e1900b2898ea79a845d581a006907a30424188b
Author: Kai Kang <kai.kang at windriver.com>
AuthorDate: Tue Aug 21 14:36:05 2018 +0800

    cmake.bbclass: fix wrong toolchain flags of nativesdk package
    
    When enable multilib in an existing build project, if already build a
    nativesdk package which inherits cmake, rebuild it will cause configure
    error when test compiler:
    
    | .../libexec/x86_64-pokysdk-linux/gcc/x86_64-pokysdk-linux/8.2.0/ld:
    | cannot find crt1.o: No such file or directory
    
    The STAGING_DIR_TARGET is different when multilib is enabled and
    disabled. And it is a component of compiler option '--sysroot'. The
    values are stored in file ${WORKDIR}/toolchain.cmake which is generated
    by task generate_toolchain_file. But the task doesn't be re-run with
    multilib status change.
    
    Add ${STAGING_DIR_TARGET} to var flag 'vardeps' of generate_toolchain_file
    to make sure file toolchain.cmake is re-gerated when toggle multilib.
    
    Signed-off-by: Kai Kang <kai.kang at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/cmake.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index fd40a98..bb63414 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -112,6 +112,7 @@ EOF
 }
 
 addtask generate_toolchain_file after do_patch before do_configure
+do_generate_toolchain_file[vardeps] += "${STAGING_DIR_TARGET}"
 
 CONFIGURE_FILES = "CMakeLists.txt"
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.