[vlc-devel] [PATCH] contrib: use cflags without the debug flags in meson crossfile
Steve Lhomme
robux4 at ycbcr.xyz
Tue Jul 23 13:04:28 CEST 2019
---
contrib/src/main.mak | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 64cbfe4de9..cc1116e3df 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -310,11 +310,12 @@ endif
ifdef HAVE_CROSS_COMPILE
HOSTVARS_MESON := PATH="$(PREFIX)/bin:$(PATH)"
else
-HOSTVARS_MESON := $(HOSTTOOLS) \
+MESON_HOST_FLAGS := \
CPPFLAGS="$(CPPFLAGS)" \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)" \
LDFLAGS="$(LDFLAGS)"
+HOSTVARS_MESON := $(HOSTTOOLS) $(MESON_HOST_FLAGS)
endif
# Add these flags after Meson consumed the CFLAGS/CXXFLAGS
@@ -602,10 +603,7 @@ endif
crossfile.meson: $(SRC)/gen-meson-crossfile.py
$(HOSTTOOLS) \
- CPPFLAGS="$(CPPFLAGS)" \
- CFLAGS="$(CFLAGS)" \
- CXXFLAGS="$(CXXFLAGS)" \
- LDFLAGS="$(LDFLAGS)" \
+ $(MESON_HOST_FLAGS) \
WINDRES="$(WINDRES)" \
PKG_CONFIG="$(PKG_CONFIG)" \
HOST_SYSTEM="$(MESON_SYSTEM_NAME)" \
--
2.17.1
More information about the vlc-devel
mailing list