From 9c31e8f8c8003d6a1c9bba131cfc4758db552418 Mon Sep 17 00:00:00 2001
From: Steven Michaud <smichaud@pobox.com>
Date: Wed, 8 Jan 2014 13:48:45 -0600
Subject: [PATCH] Bug 956931 - ICU linker error doing 32-bit and universal
 builds. r=mshal

---
 js/src/configure.in | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/js/src/configure.in b/js/src/configure.in
index 8903411bbd3e..ba0d2a74732d 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -4324,7 +4324,7 @@ if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then
          CC="$HOST_CC" CXX="$HOST_CXX" LD="$HOST_LD" \
          CFLAGS="$HOST_ICU_CFLAGS $HOST_OPTIMIZE_FLAGS" \
          CPPFLAGS="$ICU_CPPFLAGS" \
-         CXXFLAGS="$HOST_ICU_CXXFLAGS $HOST_OPTIMZIE_FLAGS" \
+         CXXFLAGS="$HOST_ICU_CXXFLAGS $HOST_OPTIMIZE_FLAGS" \
          LDFLAGS="$HOST_LDFLAGS" \
                 $SHELL $abs_srcdir/../../intl/icu/source/runConfigureICU \
                 $HOST_ICU_BUILD_OPTS \
@@ -4364,11 +4364,16 @@ if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then
     if test -n "$MOZ_DEBUG" -o "MOZ_DEBUG_SYMBOLS"; then
         ICU_CFLAGS="$ICU_CFLAGS $MOZ_DEBUG_FLAGS"
         ICU_CXXFLAGS="$ICU_CXXFLAGS $MOZ_DEBUG_FLAGS"
-        if test -n "$CROSS_COMPILE" -a "$OS_TARGET" = "Darwin"; then
-		# Bug 951758: Cross-OSX builds have issues with -g because it
-		# tries to run dsymutil
-                ICU_CFLAGS=`echo $ICU_CFLAGS | sed 's|-g||g'`
-                ICU_CXXFLAGS=`echo $ICU_CXXFLAGS | sed 's|-g||g'`
+        if test -n "$CROSS_COMPILE" -a "$OS_TARGET" = "Darwin" \
+                -a "$HOST_OS_ARCH" != "Darwin"
+        then
+            # Bug 951758: Cross-OSX builds with non-Darwin hosts have issues
+            # with -g and friends (like -gdwarf and -gfull) because they try
+            # to run dsymutil
+            changequote(,)
+            ICU_CFLAGS=`echo $ICU_CFLAGS | sed 's|-g[^ \t]*||g'`
+            ICU_CXXFLAGS=`echo $ICU_CXXFLAGS | sed 's|-g[^ \t]*||g'`
+            changequote([,])
         fi
 
         ICU_LDFLAGS="$MOZ_DEBUG_LDFLAGS"