fix two more filter out -flto

diff --git a/make/environment-build.mk b/make/environment-build.mk
index 2e78d82e6d2b3a7a8926f1e081939a7efeec2ca8..278bb5678ffc508b5a9497a1d16b8be8e84f28c8 100755 (executable)
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@@ -258,10 +258,10 @@ BUILDENV = \
        PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
 
 BUILDENV_NO_LTO = \
-       CFLAGS="$(filter-out -flto,$(TARGET_CFLAGS))" \
-       CPPFLAGS="$(filter-out -flto,$(TARGET_CPPFLAGS))" \
-       CXXFLAGS="$(filter-out -flto,$(TARGET_CXXFLAGS))" \
-       LDFLAGS="$(filter-out -flto,$(TARGET_LDFLAGS))" \
+       CFLAGS="$(filter-out -flto%,$(TARGET_CFLAGS))" \
+       CPPFLAGS="$(filter-out -flto%,$(TARGET_CPPFLAGS))" \
+       CXXFLAGS="$(filter-out -flto%,$(TARGET_CXXFLAGS))" \
+       LDFLAGS="$(filter-out -flto%,$(TARGET_LDFLAGS))" \
        PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
 
 CONFIGURE_OPTS = \

diff --git a/make/multimedia.mk b/make/multimedia.mk
index e52e5c6bff593d6a73554e8447dee485de9106b2..ee59570cd0fc5bae2b2072556c19eae733062a7d 100755 (executable)
--- a/make/multimedia.mk
+++ b/make/multimedia.mk
@@ -155,10 +155,10 @@ $(D)/alsa-lib: $(ARCHIVE)/alsa-lib-$(ALSA_LIB_VER).tar.bz2 | $(TARGETPREFIX)
                $(call apply_patches, $(addprefix alsa-lib/, $(ALSA-LIB_PATCH))); \
                autoreconf; \
                $(CONFIGURE) \
-                       CFLAGS="$(filter-out -flto,$(TARGET_CFLAGS))" \
-                       CPPFLAGS="$(filter-out -flto,$(TARGET_CPPFLAGS))" \
-                       CXXFLAGS="$(filter-out -flto,$(TARGET_CXXFLAGS))" \
-                       LDFLAGS="$(filter-out -flto,$(TARGET_LDFLAGS))" \
+                       CFLAGS="$(filter-out -flto%,$(TARGET_CFLAGS))" \
+                       CPPFLAGS="$(filter-out -flto%,$(TARGET_CPPFLAGS))" \
+                       CXXFLAGS="$(filter-out -flto%,$(TARGET_CXXFLAGS))" \
+                       LDFLAGS="$(filter-out -flto%,$(TARGET_LDFLAGS))" \
                        --prefix= \
                        --datarootdir=/.remove \
                        --with-alsa-devdir=/dev/snd/ \