mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-30 00:50:00 +00:00
Code Issues Projects Releases Wiki Activity

meson: add LDFLAGS to bbclass C/C++ link arguments

Browse Source 
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>
This commit is contained in:
Adam C. Foltzer
2017-06-08 10:34:14 -07:00
committed by Martin Jansa
parent 5ab7b440bc
commit d84b4b0bab
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/classes/meson.bbclass
+6 -5
View File
@@ -32,7 +32,8 @@ MESONOPTS = " --prefix ${prefix} \
--localstatedir ${localstatedir} \ --localstatedir ${localstatedir} \
--sharedstatedir ${sharedstatedir}" --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_HOST_ENDIAN = "${@bb.utils.contains('SITEINFO_ENDIANNESS', 'be', 'big', 'little', d)}"
MESON_TARGET_ENDIAN = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'big', 'little', d)}" MESON_TARGET_ENDIAN = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'big', 'little', d)}"
@@ -61,9 +62,9 @@ pkgconfig = 'pkg-config'
[properties] [properties]
c_args = [${@meson_array('MESON_C_ARGS', d)}] c_args = [${@meson_array('MESON_C_ARGS', d)}]
cpp_args = [${@meson_array('TOOLCHAIN_OPTIONS', d)}] c_link_args = [${@meson_array('MESON_LINK_ARGS', d)}]
c_link_args = [${@meson_array('TOOLCHAIN_OPTIONS', d)}] cpp_args = [${@meson_array('MESON_C_ARGS', d)}]
cpp_link_args = [${@meson_array('TOOLCHAIN_OPTIONS', d)}] cpp_link_args = [${@meson_array('MESON_LINK_ARGS', d)}]
[host_machine] [host_machine]
system = '${BUILD_OS}' system = '${BUILD_OS}'
@@ -74,7 +75,7 @@ endian = '${MESON_HOST_ENDIAN}'
[target_machine] [target_machine]
system = '${TARGET_OS}' system = '${TARGET_OS}'
cpu_family = '${TARGET_ARCH}' cpu_family = '${TARGET_ARCH}'
cpu = '${TARGET_ARCH}' cpu = '${TUNE_PKGARCH}'
endian = '${MESON_TARGET_ENDIAN}' endian = '${MESON_TARGET_ENDIAN}'
EOF EOF
} }
meta-oe/recipes-devtools/meson/meson_0.40.1.bb
-1
View File
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRC_URI = " \ SRC_URI = " \
git://github.com/mesonbuild/meson.git \ git://github.com/mesonbuild/meson.git \
file://native_bindir.patch \
" "
SRCREV = "b25d3e4d3f2b4d37029a507cc089bdde643c6240" SRCREV = "b25d3e4d3f2b4d37029a507cc089bdde643c6240"