mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-06 23:39:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

meson.bbclass: refactor native override

Browse Source 
The native override is specified in two different places, so let's move
it into a function to reduce code duplication.

(From OE-Core rev: c455ec4a12d4966524da9436722476aa2d428765)

Signed-off-by: Martin Kelly <mkelly@xevo.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Kelly
2018-06-01 14:02:34 -07:00
committed by Richard Purdie
parent 9481289419
commit 34bb960160
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
meta/classes/meson.bbclass
View File

@@ -90,7 +90,7 @@ meson_do_configure() {
fi
}
meson_do_configure_prepend_class-target() {
override_native_tools() {
# Set these so that meson uses the native tools for its build sanity tests,
# which require executables to be runnable. The cross file will still
# override these for the target build. Note that we do *not* set CFLAGS,
@@ -100,18 +100,15 @@ meson_do_configure_prepend_class-target() {
export CXX="${BUILD_CXX}"
export LD="${BUILD_LD}"
export AR="${BUILD_AR}"
}
meson_do_configure_prepend_class-target() {
override_native_tools
}
meson_do_configure_prepend_class-nativesdk() {
# Set these so that meson uses the native tools for its build sanity tests,
# which require executables to be runnable. The cross file will still
# override these for the nativesdk build. Note that we do *not* set CFLAGS,
# LDFLAGS, etc. as they will be slurped in by meson and applied to the
# nativesdk build, causing errors.
export CC="${BUILD_CC}"
export CXX="${BUILD_CXX}"
export LD="${BUILD_LD}"
export AR="${BUILD_AR}"
override_native_tools
}
meson_do_configure_prepend_class-native() {