[Libreoffice-commits] .: icu/makefile.mk

[Tor Lillqvist]

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

New commits:
commit 44eb529081addd3bc6c5c507d6f2436bbaa9abc1
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Jun 5 01:21:28 2011 +0300

    No ICU_NATIVE_BUILD_ROOT used any more

diff --git a/icu/makefile.mk b/icu/makefile.mk
index fe9f43c..7cc1487 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)" \