From: Michael Ow <mow@svn.icu-project.org>
Date: Fri, 9 Mar 2012 17:23:11 +0000 (+0000)
Subject: ICU-9176 Fix cross compilation failure
X-Git-Tag: milestone-59-0-1~3917
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c17026cb430d4c7d5c6b9df0556046b9c286249;p=icu

ICU-9176 Fix cross compilation failure

X-SVN-Rev: 31609
---

diff --git a/icu4c/source/configure b/icu4c/source/configure
index 64114bcb8a2..8e55edb6237 100755
--- a/icu4c/source/configure
+++ b/icu4c/source/configure
@@ -651,10 +651,6 @@ U_ENABLE_DYLOAD
 U_ENABLE_TRACING
 U_DISABLE_RENAMING
 AR
-target_os
-target_vendor
-target_cpu
-target
 RANLIB
 U_DEFAULT_SHOW_DRAFT
 UCLN_NO_AUTO_CLEANUP
@@ -1380,7 +1376,6 @@ _ACEOF
 System types:
   --build=BUILD     configure for building on BUILD [guessed]
   --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
 _ACEOF
 fi
 
@@ -5460,47 +5455,9 @@ fi
 
 
 # look for 'ar' the proper way
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
-if ${ac_cv_target+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$target_alias" = x; then
-  ac_cv_target=$ac_cv_host
-else
-  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
-esac
-target=$ac_cv_target
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-# Extract the first word of "$target_alias-ar", so it can be a program name with args.
-set dummy $target_alias-ar; ac_word=$2
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_AR+:} false; then :
@@ -5516,7 +5473,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AR="$target_alias-ar"
+    ac_cv_prog_AR="${ac_tool_prefix}ar"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -5536,10 +5493,10 @@ $as_echo "no" >&6; }
 fi
 
 
+fi
 if test -z "$ac_cv_prog_AR"; then
-  if test "$build" = "$target"; then
-    ac_ct_AR=$AR
-    # Extract the first word of "ar", so it can be a program name with args.
+  ac_ct_AR=$AR
+  # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -5564,7 +5521,6 @@ done
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
@@ -5576,9 +5532,16 @@ else
 $as_echo "no" >&6; }
 fi
 
-    AR=$ac_ct_AR
-  else
+  if test "x$ac_ct_AR" = x; then
     AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
   fi
 else
   AR="$ac_cv_prog_AR"
diff --git a/icu4c/source/configure.in b/icu4c/source/configure.in
index 3f4f4ee5699..349d355ffa1 100644
--- a/icu4c/source/configure.in
+++ b/icu4c/source/configure.in
@@ -354,7 +354,7 @@ AC_SUBST(U_DEFAULT_SHOW_DRAFT)
 AC_PROG_RANLIB
 
 # look for 'ar' the proper way
-AC_CHECK_TARGET_TOOL(AR, ar, false)
+AC_CHECK_TOOL(AR, ar, false)
 
 AC_MSG_CHECKING([whether to enable renaming of symbols])
 enabled=yes