diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-20 11:39:35 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-20 11:50:00 +0200 |
| commit | 68baa264a5c36f99bf946fae92e0faef53b737f3 (patch) | |
| tree | b30cef5f475d0327f8bc723891f83d5114b2a9ac | |
| parent | 04fc3bc91190e5bc34b82d690bebd734f1e7d962 (diff) | |
Try to fix mac build: use -arch flag to configure freetype
Change-Id: Ibc1fb03405c3dc0df952f96ecd9b2a4438c9c627
| -rw-r--r-- | external/freetype/ExternalProject_freetype.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk index 464a22107d18..a9dbef6236bb 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 $@ ) |