| 1 |
Several options we were setting in the [properties] section of the |
| 2 |
machine files have been moved to the [built-in options] section. |
| 3 |
|
| 4 |
Closes: https://bugs.gentoo.org/738710 |
| 5 |
Signed-off-by: William Hubbs <williamh@g.o> |
| 6 |
--- |
| 7 |
eclass/meson.eclass | 4 ++-- |
| 8 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 9 |
|
| 10 |
diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
| 11 |
index 21338280df3..a02e94c7a01 100644 |
| 12 |
--- a/eclass/meson.eclass |
| 13 |
+++ b/eclass/meson.eclass |
| 14 |
@@ -185,7 +185,7 @@ _meson_create_cross_file() { |
| 15 |
strip = $(_meson_env_array "$(tc-getSTRIP)") |
| 16 |
windres = $(_meson_env_array "$(tc-getRC)") |
| 17 |
|
| 18 |
- [properties] |
| 19 |
+ [built-in options] |
| 20 |
c_args = $(_meson_env_array "${CFLAGS} ${CPPFLAGS}") |
| 21 |
c_link_args = $(_meson_env_array "${CFLAGS} ${LDFLAGS}") |
| 22 |
cpp_args = $(_meson_env_array "${CXXFLAGS} ${CPPFLAGS}") |
| 23 |
@@ -236,7 +236,7 @@ _meson_create_native_file() { |
| 24 |
strip = $(_meson_env_array "$(tc-getBUILD_STRIP)") |
| 25 |
windres = $(_meson_env_array "$(tc-getBUILD_PROG RC windres)") |
| 26 |
|
| 27 |
- [properties] |
| 28 |
+ [built-in options] |
| 29 |
c_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_CPPFLAGS}") |
| 30 |
c_link_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_LDFLAGS}") |
| 31 |
cpp_args = $(_meson_env_array "${BUILD_CXXFLAGS} ${BUILD_CPPFLAGS}") |
| 32 |
-- |
| 33 |
2.26.2 |
Archives