summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-04-16 12:02:10 +0300
committerTor Lillqvist <tml@collabora.com>2014-04-16 13:06:06 +0300
commit3ac1663a60926ab2f3fbbd1219455e37d5a83b45 (patch)
treedbb932e84765db2ed5b1b0c348c03f52bef9529a /external
parent9eb25b0fb9606b7740ba92697fbd5acf34dd9154 (diff)
No use to build tools or extras when cross-compiling
Also, for some reason building the endian check thing fails when trying to use Clang for Android, so just hardcode it. Change-Id: I04fb7ba4f88a1dc6a4e743b39e7c0cd19d7e3598
Diffstat (limited to 'external')
-rw-r--r--external/icu/ExternalProject_icu.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk
index 445026060668..8f1104eab6b3 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -77,8 +77,9 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
CXXFLAGS=$(icu_CXXFLAGS) LDFLAGS=$(icu_LDFLAGS) \
./configure \
--disable-layout --disable-samples \
+ $(if $(CROSS_COMPILING),--disable-tools --disable-extras) \
$(if $(filter IOS ANDROID,$(OS)),--disable-dyload) \
- $(if $(filter ANDROID,$(OS)),--disable-strict) \
+ $(if $(filter ANDROID,$(OS)),--disable-strict ac_cv_c_bigendian=no) \
$(if $(filter SOLARIS AIX,$(OS)),--disable-64bit-libs) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),\
--enable-static --disable-shared,\