summaryrefslogtreecommitdiff
path: root/icu
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2011-06-05 01:21:28 +0300
committerTor Lillqvist <tml@iki.fi>2011-06-05 01:22:02 +0300
commit6654a13382259f6908b12786fd909fe514059ff4 (patch)
treed6b5eaa776037dbc0aeadd67b82d878b425ed92d /icu
parentf0ffdd64179e6808bc455891f198691e21055104 (diff)
No ICU_NATIVE_BUILD_ROOT used any more
Diffstat (limited to 'icu')
-rw-r--r--icu/makefile.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk
index fe9f43c904f4..7cc1487aca0c 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -111,7 +111,8 @@ STATIC_OR_SHARED=--disable-static --enable-shared
.ENDIF
.IF "$(CROSS_COMPILING)"!=""
-BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-cross-build=$(ICU_NATIVE_BUILD_ROOT)
+# We require that the cross-build-toolset target from the top Makefile(.in) has bee built
+BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-cross-build=$(posix_PWD)/$(INPATH_FOR_BUILD)/misc/build/icu/source
.ENDIF
CONFIGURE_ACTION+=sh -c 'CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \