diff options
author | Ross Burton <ross.burton@intel.com> | 2017-06-26 16:11:11 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-01 09:59:26 +0200 |
commit | 11951f01d9e2385d80ca708fcb1f5c98b4641d7b (patch) | |
tree | 53bdc3c1dafb605ab7ca9660e57beee44f2a1692 /meta-oe | |
parent | f0d77f8501b3f4f99aca476a16b0ae9f00234983 (diff) | |
download | meta-openembedded-11951f01d9e2385d80ca708fcb1f5c98b4641d7b.tar.gz |
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@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/classes/meson.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-oe/classes/meson.bbclass b/meta-oe/classes/meson.bbclass index cc9bc505b..72f96c541 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)}] | |||
67 | cpp_link_args = [${@meson_array('MESON_LINK_ARGS', d)}] | 67 | cpp_link_args = [${@meson_array('MESON_LINK_ARGS', d)}] |
68 | 68 | ||
69 | [host_machine] | 69 | [host_machine] |
70 | system = '${BUILD_OS}' | 70 | system = '${HOST_OS}' |
71 | cpu_family = '${BUILD_ARCH}' | 71 | cpu_family = '${HOST_ARCH}' |
72 | cpu = '${BUILD_ARCH}' | 72 | cpu = '${HOST_ARCH}' |
73 | endian = '${MESON_HOST_ENDIAN}' | 73 | endian = '${MESON_HOST_ENDIAN}' |
74 | 74 | ||
75 | [target_machine] | 75 | [target_machine] |