diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-02-27 16:19:43 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-02-27 18:09:01 +0100 |
commit | d729d169de479e622e8767edd72aee3ae5bc61a9 (patch) | |
tree | 01000fbf6cc713644b308299bbfc743b20bc6d15 /external/cairo | |
parent | fdo#39468 Translate German comments: sw/source/filter/ww1 (diff) | |
download | core-d729d169de479e622e8767edd72aee3ae5bc61a9.tar.gz core-d729d169de479e622e8767edd72aee3ae5bc61a9.zip |
normalize values of CROSS_COMPILING
Change-Id: I0cc43cef91e3fcd82a3558a16ab0afbd4d56b141
Diffstat (limited to 'external/cairo')
-rw-r--r-- | external/cairo/ExternalProject_cairo.mk | 2 | ||||
-rw-r--r-- | external/cairo/ExternalProject_pixman.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index d055db06429c..cc26096f23d6 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -46,7 +46,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : --disable-valgrind \ $(if $(filter IOS,$(OS)),--disable-ft,--enable-ft --enable-fc) \ --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no \ - $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ && cp cairo-version.h src/cairo-version.h \ && cd src && $(MAKE) \ diff --git a/external/cairo/ExternalProject_pixman.mk b/external/cairo/ExternalProject_pixman.mk index 80e62fa89190..8eb7d8ce9498 100644 --- a/external/cairo/ExternalProject_pixman.mk +++ b/external/cairo/ExternalProject_pixman.mk @@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,pixman,build) : ./configure \ $(if $(filter MACOSX IOS,$(OS)),--disable-shared,--disable-static) \ $(if $(filter ANDROID,$(OS)),--disable-arm-simd --disable-arm-neon --disable-arm-iwmmxt) \ - $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) |