[vlc-devel] [PATCH] contrib: harfbuzz: Pass -mbig-obj to the assembler

[Hugo Beauzée-Luyssen]

Which fixes non-optimized win64 builds
---
 contrib/src/harfbuzz/rules.mak | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index 374a4ff1da..aecbbe9214 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -25,8 +25,14 @@ harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.xz .sum-harfbuzz
 
 DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
 
+HARFBUZZ_CXXFLAGS := $(CXXFLAGS)
+ifdef HAVE_WIN64
+HARFBUZZ_CXXFLAGS := -Wa,-mbig-obj $(HARFBUZZ_CXXFLAGS)
+endif
+
 .harfbuzz: harfbuzz toolchain.cmake
-	cd $< && mkdir -p build && cd build && $(HOSTVARS_PIC) $(CMAKE) \
+	cd $< && mkdir -p build && cd build && $(HOSTVARS_PIC) CXXFLAGS="$(HARFBUZZ_CXXFLAGS)" \
+		$(CMAKE) \
 		-DBUILD_SHARED_LIBS:BOOL=OFF \
 		-DHB_HAVE_FREETYPE:BOOL=ON \
 		-DHB_BUILD_TESTS=OFF \
-- 
2.20.1