Bug 845089 - Followup: Pass Windows normalized path into mozilla configure; r=Callek
authorGregory Szorc <gps@mozilla.com>
Thu, 28 Feb 2013 13:33:12 -0800
changeset 15061 61c78da2143906e6ce160f717b0a3891c8db9142
parent 15060 e5f81ee8ccf8ff0a1ba394adc060f72e4c1549fe
child 15062 d49676be02ef601d51f4ed5be8c18387703c9a08
push id898
push userbugzilla@standard8.plus.com
push dateMon, 13 May 2013 17:03:31 +0000
treeherdercomm-beta@3106694b14de [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek
bugs845089
Bug 845089 - Followup: Pass Windows normalized path into mozilla configure; r=Callek Partial fix to issue causing a CLOSED TREE.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -6415,20 +6415,26 @@ fi
 # build Mozilla first
 #
 # the subdir may not yet have been created in the build tree.
 #
 if test ! -d "mozilla"; then
     mkdir "mozilla"
 fi
 
+external_topsrcdir=$_topsrcdir
+
+if test "$msyshost"; then
+    external_topsrcdir=`cd $_topsrcdir && pwd -W $_topsrcdir`
+fi
+
 # --enable-application needs to find confvars.sh, build.mk, etc in the gived dir, so add ../
 # --external-source-dir is so the build system doesn't reject files outside known locations.
 # --disable-official-branding disables all checks for official branding, as we're doing this ourselves in our own repo
-ac_configure_args="$_SUBDIR_CONFIG_ARGS --enable-application=../$MOZ_BUILD_APP --with-external-source-dir=$_topsrcdir --disable-official-branding --with-branding=../$REAL_BRANDING_DIRECTORY"
+ac_configure_args="$_SUBDIR_CONFIG_ARGS --enable-application=../$MOZ_BUILD_APP --with-external-source-dir=$external_topsrcdir --disable-official-branding --with-branding=../$REAL_BRANDING_DIRECTORY"
 if test -n "$L10NBASEDIR"; then
     dnl Override the initial value with the new one which is guaranteed to be an absolute path.
     ac_configure_args="$ac_configure_args --with-l10n-base=$L10NBASEDIR"
 fi
 
 # for Mac universal builds, we need to call the Mozilla configure with MOZ_BUILD_APP=[i386|x86_64]
 MOZ_BUILD_APP_CACHED="$MOZ_BUILD_APP"
 if test -n "$MOZ_CURRENT_PROJECT"; then