[Libreoffice-commits] core.git: external/freetype

[Zolnai Tamás]

 external/freetype/ExternalProject_freetype.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 68baa264a5c36f99bf946fae92e0faef53b737f3
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Sun Apr 20 11:39:35 2014 +0200

    Try to fix mac build: use -arch flag to configure freetype
    
    Change-Id: Ibc1fb03405c3dc0df952f96ecd9b2a4438c9c627

diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk
index 464a221..a9dbef6 100644
--- a/external/freetype/ExternalProject_freetype.mk
+++ b/external/freetype/ExternalProject_freetype.mk
@@ -29,7 +29,8 @@ $(call gb_ExternalProject_get_state_target,freetype,build) :
 			--without-bzip2 \
 			--prefix=$(call gb_UnpackedTarball_get_dir,freetype/instdir) \
 			--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
-			CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" \
+			CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS) $(if $(filter MACOSX,$(OS)),-arch i386 -arch x86_64)" \
+			$(if $(filter MACOSX,$(OS)),LDFLAGS="-arch i386 -arch x86_64") \
 		&& chmod +x builds/unix/freetype-config \
 		&& $(MAKE) install \
 		&& touch $@	)