Bug 506493 - Resync' configure.in between c-c and m-c; (Qv1b) Port bug 520622.
authorSerge Gautherie <sgautherie.bz@free.fr>
Thu, 15 Apr 2010 09:05:18 +0200
changeset 5445 4d451d2469282a68c8b1ddb69307182b2989528b
parent 5444 5e43be84e43835ac9fe12cec557dbc2733730359
child 5446 793f932b45d5984b91a3350bb4c4486a05128219
push id4204
push usersgautherie.bz@free.fr
push dateThu, 15 Apr 2010 07:12:19 +0000
treeherdercomm-central@793f932b45d5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs506493, 520622
Bug 506493 - Resync' configure.in between c-c and m-c; (Qv1b) Port bug 520622. r=Callek. Bug 520622 - use windows style paths for windows mobile build
configure.in
--- a/configure.in
+++ b/configure.in
@@ -316,28 +316,28 @@ case "$target" in
 
     echo -----------------------------------------------------------------------------
     echo Building Windows CE Shunt Library and Tool Chain
     echo Using SDK in:
     echo $WINCE_SDK_DIR
 
     ac_exeext=.exe
 
-    _pwdw=`pwd -W`
-    _pwd=`pwd`
-    make OGLES_SDK_DIR="$OGLES_SDK_DIR" WINCE_SDK_DIR="$WINCE_SDK_DIR" TOPSRCDIR="$_topsrcdir/mozilla" OBJDIR="$_pwdw/mozilla" -C $srcdir/mozilla/build/wince/tools
-
-    CC="$_pwd/mozilla/dist/sdk/bin/arm-wince-gcc"
-    CXX="$_pwd/mozilla/dist/sdk/bin/arm-wince-gcc"
-    CPP="$_pwd/mozilla/dist/sdk/bin/arm-wince-gcc -E -nologo"
-    CXXCPP="$_pwd/mozilla/dist/sdk/bin/arm-wince-gcc -TP -E -nologo"
-    LD="$_pwd/mozilla/dist/sdk/bin/arm-wince-link"
-    AR="$_pwd/mozilla/dist/sdk/bin/arm-wince-lib"
-    AS="$_pwd/mozilla/dist/sdk/bin/arm-wince-as"
-    RC="$_pwd/mozilla/dist/sdk/bin/arm-wince-res"
+    _pwd=`pwd -W`/mozilla
+    _topsrcdirwin=`cd \`dirname $0\`; pwd -W`/mozilla
+    make OGLES_SDK_DIR="$OGLES_SDK_DIR" WINCE_SDK_DIR="$WINCE_SDK_DIR" TOPSRCDIR="$_topsrcdirwin" OBJDIR="$_pwd" -C $srcdir/mozilla/build/wince/tools
+
+    CC="$_pwd/dist/sdk/bin/arm-wince-gcc.exe"
+    CXX="$_pwd/dist/sdk/bin/arm-wince-gcc.exe"
+    CPP="$_pwd/dist/sdk/bin/arm-wince-gcc.exe -E -nologo"
+    CXXCPP="$_pwd/dist/sdk/bin/arm-wince-gcc.exe -TP -E -nologo"
+    LD="$_pwd/dist/sdk/bin/arm-wince-link.exe"
+    AR="$_pwd/dist/sdk/bin/arm-wince-lib.exe"
+    AS="$_pwd/dist/sdk/bin/arm-wince-as.exe"
+    RC="$_pwd/dist/sdk/bin/arm-wince-res.exe"
     echo -----------------------------------------------------------------------------
     ;;
 esac
 
 if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then
     echo "cross compiling from $host to $target"
     cross_compiling=yes
 
@@ -2075,17 +2075,18 @@ case "$target" in
     mips*)
         MOZ_DEBUG_FLAGS="-g" # We want inlining
     ;;
     esac
     ;;
 
 *-wince*)
     TARGET_COMPILER_ABI=msvc
-    MOZ_TOOLS_DIR=`echo $MOZ_TOOLS`
+    MOZ_TOOLS_DIR=`cd $MOZ_TOOLS && pwd -W`
+    MOZ_BUILD_ROOT=`cd $MOZ_BUILD_ROOT && pwd -W`
     AR_LIST="$AR -list"
     AR_EXTRACT="$AR -extract"
     AR_DELETE="$AR d"
     AR_FLAGS='-OUT:"$@"'
 
     if test "$AS_BIN"; then
         AS="$AS_BIN"
     fi