diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-06-06 00:30:56 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-06-06 00:30:56 +0300 |
| commit | 718381b51c459b55ce25326215fe0edce5572e88 (patch) | |
| tree | f6d55d9b6ee8ca0fa293bb0fe3e2c70216641c78 /cairo | |
| parent | 6654a13382259f6908b12786fd909fe514059ff4 (diff) | |
Fix cairo build when cross-compiling to ppc MacOSX
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/cairo/makefile.mk | 3 | ||||
| -rw-r--r-- | cairo/pixman/makefile.mk | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 0d3cd3344332..abe850db851e 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -109,6 +109,9 @@ cairo_CPPFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS) CONFIGURE_DIR= CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure CONFIGURE_FLAGS=--enable-static=no --disable-xlib --disable-ft --disable-svg --enable-quartz --enable-quartz-font --enable-gtk-doc=no --enable-test-surfaces=no PKG_CONFIG=./dummy_pkg_config ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) +.IF "$(CROSS_COMPILING)"!="" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF cairo_CPPFLAGS+=$(EXTRA_CDEFS) cairo_LDFLAGS+=$(EXTRA_LINKFLAGS) BUILD_ACTION=$(GNUMAKE) diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 83ea75922178..b344520f66af 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -85,6 +85,9 @@ CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no CPPFLAGS="$(EXTRA_CDEFS)" CONFIGURE_FLAGS+=CFLAGS="$(EXTRA_CFLAGS) $(EXTRA_CDEFS)" .ENDIF # "$(EXTRA_CDEFS)"!="" .ENDIF # "$(SYSBASE)"!="" +.IF "$(CROSS_COMPILING)"!="" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) |