diff options
| author |   Adam C. Foltzer <acfoltzer@galois.com> | 2017-06-08 10:34:14 -0700 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-06-14 14:51:15 +0200 |
| commit | d84b4b0bab9823c81f0ea38ca12eb8bccf892ca4 (patch) | |
| tree | b38477168754f84a277b3183fc9205d6776b052a | |
| parent | 5ab7b440bcdbdffccc57a0c4e5c509a7282b12a1 (diff) | |
| download | meta-openembedded-contrib-d84b4b0bab9823c81f0ea38ca12eb8bccf892ca4.tar.gz | |
meson: add LDFLAGS to bbclass C/C++ link arguments
This adds compiler flags for C++ projects, and fixes the linker
arguments for both C and C++ to avoid the GNU_HASH qa failure
Signed-off-by: Adam C. Foltzer <acfoltzer@galois.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/classes/meson.bbclass | 11 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/meson/meson_0.40.1.bb | 1 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta-oe/classes/meson.bbclass b/meta-oe/classes/meson.bbclass index d2ae626ebe..2c48a7eb9c 100644 --- a/meta-oe/classes/meson.bbclass +++ b/meta-oe/classes/meson.bbclass @@ -32,7 +32,8 @@ MESONOPTS = " --prefix ${prefix} \ --localstatedir ${localstatedir} \ --sharedstatedir ${sharedstatedir}" -MESON_C_ARGS = "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" +MESON_C_ARGS = "${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS}" +MESON_LINK_ARGS = "${MESON_C_ARGS} ${LDFLAGS}" MESON_HOST_ENDIAN = "${@bb.utils.contains('SITEINFO_ENDIANNESS', 'be', 'big', 'little', d)}" MESON_TARGET_ENDIAN = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'big', 'little', d)}" @@ -61,9 +62,9 @@ pkgconfig = 'pkg-config' [properties] c_args = [${@meson_array('MESON_C_ARGS', d)}] -cpp_args = [${@meson_array('TOOLCHAIN_OPTIONS', d)}] -c_link_args = [${@meson_array('TOOLCHAIN_OPTIONS', d)}] -cpp_link_args = [${@meson_array('TOOLCHAIN_OPTIONS', d)}] +c_link_args = [${@meson_array('MESON_LINK_ARGS', d)}] +cpp_args = [${@meson_array('MESON_C_ARGS', d)}] +cpp_link_args = [${@meson_array('MESON_LINK_ARGS', d)}] [host_machine] system = '${BUILD_OS}' @@ -74,7 +75,7 @@ endian = '${MESON_HOST_ENDIAN}' [target_machine] system = '${TARGET_OS}' cpu_family = '${TARGET_ARCH}' -cpu = '${TARGET_ARCH}' +cpu = '${TUNE_PKGARCH}' endian = '${MESON_TARGET_ENDIAN}' EOF } diff --git a/meta-oe/recipes-devtools/meson/meson_0.40.1.bb b/meta-oe/recipes-devtools/meson/meson_0.40.1.bb index fd96b4238e..a2c5e4d397 100644 --- a/meta-oe/recipes-devtools/meson/meson_0.40.1.bb +++ b/meta-oe/recipes-devtools/meson/meson_0.40.1.bb @@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = " \ git://github.com/mesonbuild/meson.git \ - file://native_bindir.patch \ " SRCREV = "b25d3e4d3f2b4d37029a507cc089bdde643c6240" |