--- mozilla/directory/c-sdk/configure.in.fix	2006-11-22 20:07:41 +0300
+++ mozilla/directory/c-sdk/configure.in	2006-11-22 20:08:03 +0300
@@ -752,31 +752,25 @@ LIB_SUFFIX=a
 LIB_PREFIX=lib
 DLL_SUFFIX=so
 ASM_SUFFIX=s
 MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
 AR_FLAGS='cr $@'
 AS='$(CC)'
 ASFLAGS='$(CFLAGS)'
 
-if test -n "$CROSS_COMPILE"; then
-    OS_ARCH=`echo $target_os | sed -e 's|/|_|g'`
-    OS_RELEASE=
-    OS_TEST="${target_cpu}"
-    case "${target_os}" in
-        linux*)       OS_ARCH=Linux ;;
-        solaris*)     OS_ARCH=SunOS OS_RELEASE=5 ;;
-        mingw*)     OS_ARCH=WINNT ;;
-        darwin*)    OS_ARCH=Darwin ;;
-    esac
-else
-    OS_ARCH=`uname -s | sed -e 's|/|_|g'`
-    OS_RELEASE=`uname -r`
-    OS_TEST=`uname -m`
-fi
+OS_ARCH=`echo $target_os | sed -e 's|/|_|g'`
+OS_RELEASE=
+OS_TEST="${target_cpu}"
+case "${target_os}" in
+    linux*)       OS_ARCH=Linux ;;
+    solaris*)     OS_ARCH=SunOS OS_RELEASE=5 ;;
+    mingw*)     OS_ARCH=WINNT ;;
+    darwin*)    OS_ARCH=Darwin ;;
+esac
 
 if test "$OS_ARCH" = "IRIX64"; then
     OS_ARCH=IRIX
 fi
 
 if test "$OS_ARCH" = "Linux"; then
     OS_RELEASE=`echo $OS_RELEASE | sed 's/-.*//'`
     OS_RELEASE=`echo $OS_RELEASE | awk -F. '{ print $1 "." $2 }'`