[vlc-commits] contrib: flac: use -mstackrealign on win32

[Tristan Matthews]

vlc/vlc-2.2 | branch: master | Tristan Matthews <tmatth at videolan.org> | Fri Apr 10 00:40:32 2015 -0400| [fb951d9479fdf24ccece76eac56242a6a39102b1] | committer: Jean-Baptiste Kempf

contrib: flac: use -mstackrealign on win32

Fixes #14104

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit c41fcd64a7dc84663931bfdea8c465a579deef05)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/flac/rules.mak |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak
index bf72caf..b067b5c 100644
--- a/contrib/src/flac/rules.mak
+++ b/contrib/src/flac/rules.mak
@@ -42,10 +42,15 @@ FLACCONF += --disable-asm-optimizations
 endif
 endif
 
+FLAC_CFLAGS := $(CFLAGS)
+ifdef HAVE_WIN32
+FLAC_CFLAGS += -mstackrealign
+endif
+
 DEPS_flac = ogg $(DEPS_ogg)
 
 .flac: flac
-	cd $< && $(HOSTVARS) ./configure $(FLACCONF)
+	cd $< && $(HOSTVARS) CFLAGS="$(FLAC_CFLAGS)" ./configure $(FLACCONF)
 	cd $</include && $(MAKE) install
 	cd $</src && $(MAKE) -C share install && $(MAKE) -C libFLAC install
 	touch $@