From 6654a13382259f6908b12786fd909fe514059ff4 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Sun, 5 Jun 2011 01:21:28 +0300
Subject: No ICU_NATIVE_BUILD_ROOT used any more

---
 icu/makefile.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'icu')

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)" \
-- 
cgit