| 1 |
commit: cbeeaff9e92cd67e100e5810ce1cf5d075d3f438 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 3 17:46:50 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 3 17:54:46 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbeeaff9 |
| 7 |
|
| 8 |
meson.eclass: avoid leaking BUILD vars outside meson_src_configure |
| 9 |
|
| 10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/meson.eclass | 15 ++++++++++++++- |
| 13 |
1 file changed, 14 insertions(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
| 16 |
index 17875d97c47..773413bb602 100644 |
| 17 |
--- a/eclass/meson.eclass |
| 18 |
+++ b/eclass/meson.eclass |
| 19 |
@@ -287,13 +287,26 @@ meson_feature() { |
| 20 |
meson_src_configure() { |
| 21 |
debug-print-function ${FUNCNAME} "$@" |
| 22 |
|
| 23 |
- tc-export_build_env |
| 24 |
+ local BUILD_CFLAGS=${BUILD_CFLAGS} |
| 25 |
+ local BUILD_CPPFLAGS=${BUILD_CPPFLAGS} |
| 26 |
+ local BUILD_CXXFLAGS=${BUILD_CXXFLAGS} |
| 27 |
+ local BUILD_FCFLAGS=${BUILD_FCFLAGS} |
| 28 |
+ local BUILD_OBJCFLAGS=${BUILD_OBJCFLAGS} |
| 29 |
+ local BUILD_OBJCXXFLAGS=${BUILD_OBJCXXFLAGS} |
| 30 |
+ local BUILD_LDFLAGS=${BUILD_LDFLAGS} |
| 31 |
+ |
| 32 |
if tc-is-cross-compiler; then |
| 33 |
+ : ${BUILD_CFLAGS:=-O1 -pipe} |
| 34 |
+ : ${BUILD_CXXFLAGS:=-O1 -pipe} |
| 35 |
: ${BUILD_FCFLAGS:=-O1 -pipe} |
| 36 |
: ${BUILD_OBJCFLAGS:=-O1 -pipe} |
| 37 |
: ${BUILD_OBJCXXFLAGS:=-O1 -pipe} |
| 38 |
else |
| 39 |
+ : ${BUILD_CFLAGS:=${CFLAGS}} |
| 40 |
+ : ${BUILD_CPPFLAGS:=${CPPFLAGS}} |
| 41 |
+ : ${BUILD_CXXFLAGS:=${CXXFLAGS}} |
| 42 |
: ${BUILD_FCFLAGS:=${FCFLAGS}} |
| 43 |
+ : ${BUILD_LDFLAGS:=${LDFLAGS}} |
| 44 |
: ${BUILD_OBJCFLAGS:=${OBJCFLAGS}} |
| 45 |
: ${BUILD_OBJCXXFLAGS:=${OBJCXXFLAGS}} |
| 46 |
fi |
Archives