[oe-commits] [meta-openembedded] 27/53: Revert "meson: fix build/host confusion for bbclass"

git at git.openembedded.org git at git.openembedded.org
Sat Jul 1 08:00:10 UTC 2017


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

martin_jansa pushed a commit to branch master
in repository meta-openembedded.

commit 11951f01d9e2385d80ca708fcb1f5c98b4641d7b
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Mon Jun 26 16:11:11 2017 +0100

    Revert "meson: fix build/host confusion for bbclass"
    
    This patch was incorrect: meson and autotools (thus OE) don't have conflicting
    terminology, and using HOST_* for the host_machine variables is correct.
    
    This reverts commit 77eae90ef5ca3f9a4bdf5727a29713dd2b215165.
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-oe/classes/meson.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-oe/classes/meson.bbclass b/meta-oe/classes/meson.bbclass
index cc9bc50..72f96c5 100644
--- a/meta-oe/classes/meson.bbclass
+++ b/meta-oe/classes/meson.bbclass
@@ -67,9 +67,9 @@ cpp_args = [${@meson_array('MESON_C_ARGS', d)}]
 cpp_link_args = [${@meson_array('MESON_LINK_ARGS', d)}]
 
 [host_machine]
-system = '${BUILD_OS}'
-cpu_family = '${BUILD_ARCH}'
-cpu = '${BUILD_ARCH}'
+system = '${HOST_OS}'
+cpu_family = '${HOST_ARCH}'
+cpu = '${HOST_ARCH}'
 endian = '${MESON_HOST_ENDIAN}'
 
 [target_machine]

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


More information about the Openembedded-commits mailing list