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

Change-Id: Ibc1fb03405c3dc0df952f96ecd9b2a4438c9c627

Try to fix mac build: use -arch flag to configure freetype
Change-Id: Ibc1fb03405c3dc0df952f96ecd9b2a4438c9c627
68baa264 · Zolnai Tamás · 04fc3bc9 · 68baa264
Kaydet (Commit) 68baa264 authored Nis 20, 2014 tarafından Zolnai Tamás
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

ExternalProject_freetype.mk external/freetype/ExternalProject_freetype.mk +2 -1

No files found.
--- 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 $@	)