icu: Fix -native version so it doesn't use target substituions in configure step

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/icu/icu-3.6.inc b/meta/packages/icu/icu-3.6.inc
index 90b4729bfcb4a9afa2ec8ddbe5d900bb7ee3d923..e8d4f48d221738362b4ccfa361bde266df3ce181 100644 (file)
--- a/meta/packages/icu/icu-3.6.inc
+++ b/meta/packages/icu/icu-3.6.inc
@@ -17,12 +17,16 @@ do_configure() {
        libtoolize --force
        gnu-configize --force
        oe_runconf
-       for i in */Makefile */*.inc */*/Makefile */*/*.inc ; do
-               sed -i -e 's:$(INVOKE) $(BINDIR)/:$(INVOKE) :g' $i 
-               sed -i -e 's:$(BINDIR)/::g' $i 
-       done
-       sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc || true
-       sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc.in || true
+       if [ "${BUILD_ARCH}" != "${HOST_ARCH" ]; then
+               # In the non-native case we need to make substitutions to use
+               # the native versions of the tools
+               for i in */Makefile */*.inc */*/Makefile */*/*.inc ; do
+                       sed -i -e 's:$(INVOKE) $(BINDIR)/:$(INVOKE) :g' $i 
+                       sed -i -e 's:$(BINDIR)/::g' $i 
+               done
+               sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc || true
+               sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc.in || true
+       fi
 }
 
 do_compile() {