[vlc-commits] contribs: live555: Set CXXFLAGS for macosx

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Wed Apr 29 21:53:41 2020 +0200| [f9701a24327fea50777fffe1f0450a7a8a48b90d] | committer: David Fuhrmann

contribs: live555: Set CXXFLAGS for macosx

CXXFLAGS are needed to set correct stdlib.

(cherry picked from commit c40a3d27b1d084172d9f59b482f4e06f4eaa3878)
Signed-off-by: David Fuhrmann <dfuhrmann at videolan.org>

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

 contrib/src/live555/rules.mak | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index 3bb8e78b3d..f5984577dc 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -55,6 +55,8 @@ live555: $(LIVE555_FILE) .sum-live555
 	cd live && sed -i.orig -e s/"libtool -s -o"/"ar cr"/g config.macosx*
 	# Add Extra LDFLAGS for macOS
 	cd live && sed -i.orig -e 's%$(CXX)%$(CXX)\ $(EXTRA_LDFLAGS)%' config.macosx
+	# Add CXXFLAGS for macOS (force libc++)
+	cd live && sed -i.orig -e 's%^\(CPLUSPLUS_FLAGS.*\)$$%\1 '"$(CXXFLAGS)%" config.macosx
 	# Add the Extra_CFLAGS to all config files
 	cd live && sed -i.orig \
 		-e 's%^\(COMPILE_OPTS.*\)$$%\1 '"$(LIVE_EXTRA_CFLAGS)%" config.*