[vlc-commits] contrib: srt: set the C/XXFLAGS in a more generic way

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed May 16 11:01:34 2018 +0200| [4d9dcf64d8400e32494439dd3b6068a1a2c39c05] | committer: Steve Lhomme

contrib: srt: set the C/XXFLAGS in a more generic way

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4d9dcf64d8400e32494439dd3b6068a1a2c39c05
---

 contrib/src/srt/rules.mak | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/contrib/src/srt/rules.mak b/contrib/src/srt/rules.mak
index 4dfc9f9989..61c0544a16 100644
--- a/contrib/src/srt/rules.mak
+++ b/contrib/src/srt/rules.mak
@@ -11,15 +11,18 @@ ifeq ($(call need_pkg,"srt >= 1.2.2"),)
 PKGS_FOUND += srt
 endif
 
-ifdef HAVE_DARWIN_OS
-SRT_DARWIN=CFLAGS="$(CFLAGS) -Wno-error=partial-availability" CXXFLAGS="$(CXXFLAGS) -Wno-error=partial-availability"
-endif
-
+SRT_CFLAGS   := $(CFLAGS)
+SRT_CXXFLAGS := $(CXXFLAGS)
 DEPS_srt = gnutls $(DEPS_gnutls)
 ifdef HAVE_WIN32
 DEPS_srt += pthreads $(DEPS_pthreads)
 endif
 
+ifdef HAVE_DARWIN_OS
+SRT_CFLAGS   += -Wno-error=partial-availability
+SRT_CXXFLAGS += -Wno-error=partial-availability
+endif
+
 $(TARBALLS)/srt-$(SRT_VERSION).tar.gz:
 	$(call download_pkg,$(SRT_URL),srt)
 
@@ -35,7 +38,7 @@ srt: srt-$(SRT_VERSION).tar.gz .sum-srt
 	mv srt-$(SRT_VERSION) $@ && touch $@
 
 .srt: srt toolchain.cmake
-	cd $< && $(HOSTVARS_PIC) $(SRT_DARWIN) $(CMAKE) \
+	cd $< && $(HOSTVARS_PIC) CFLAGS="$(SRT_CFLAGS)" CXXFLAGS="$(SRT_CXXFLAGS)" $(CMAKE) \
 		-DENABLE_SHARED=OFF -DUSE_GNUTLS=ON -DENABLE_CXX11=OFF
 	cd $< && $(MAKE) install
 	touch $@