Bug 1113308 - Further fixes for Windows builds via autospider.sh, r=terrence
authorSteve Fink <sfink@mozilla.com>
Thu, 18 Dec 2014 17:06:08 -0800
changeset 220570 f29790f7e13ee0bc1a2da59008f528aff96132d5
parent 220569 4757a1d4a23eb88c435f8ddfe3df66450d483da1
child 220571 074eb94f2c2edfe0efa1daae0ebdbfd00c733911
push id10503
push userryanvm@gmail.com
push dateFri, 19 Dec 2014 20:13:42 +0000
treeherderfx-team@98ee95ac6be5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersterrence
bugs1113308
milestone37.0a1
Bug 1113308 - Further fixes for Windows builds via autospider.sh, r=terrence
js/src/devtools/automation/winbuildenv.sh
--- a/js/src/devtools/automation/winbuildenv.sh
+++ b/js/src/devtools/automation/winbuildenv.sh
@@ -5,17 +5,17 @@ mk_add_options() {
   : do nothing
 }
 
 topsrcdir="$SOURCE"
 
 # When running on a developer machine, several variables will already
 # have the right settings and we will need to keep them since the
 # Windows mozconfigs overwrite them.
-export OLD_INCLUDE="$INCLUDE"
+export OLD_INCLUDE=$(IFS=';'; for d in $INCLUDE; do ( cd "$d" && echo -n $(pwd): ); done)
 export OLD_LIB=$(IFS=';'; for d in $LIB; do ( cd "$d" && echo -n $(pwd): ); done)
 export OLD_LIBPATH=$(IFS=';'; for d in $LIBPATH; do ( cd "$d" && echo -n $(pwd): ); done)
 
 # The various browser/config/mozconfigs/win32/* files use these checks to pick
 # the compiler.
 if $USE_64BIT; then
   . $topsrcdir/build/win64/mozconfig.vs2013
 elif test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
@@ -41,11 +41,11 @@ fi
 
 # Set INCLUDE to any existing directories from either the INCLUDE set by the
 # mozconfig, or pre-existing directories. I have observed cases where extra
 # nonexistent directories in the INCLUDE search path causes the compiler to
 # fail to find files that show up later in the search path.
 #
 # Note that the mozconfig will use msys-style paths and OLD_INCLUDE will use
 # Windows-style paths, but perl and cl.exe both seem ok with either.
-export INCLUDE="$(perl -le 'print join ":", grep { -d $_ } split(":", $ENV{INCLUDE}),split(";", $ENV{OLD_INCLUDE})')"
+export INCLUDE="$(perl -le 'print join ":", grep { -d $_ } split(":", $ENV{INCLUDE}),split(":", $ENV{OLD_INCLUDE})')"
 export LIB="$(perl -le 'print join ":", grep { -d $_ } split(":", $ENV{LIB}),split(":", $ENV{OLD_LIB})')"
 export LIBPATH="$(perl -le 'print join ":", grep { -d $_ } split(":", $ENV{LIBPATH}),split(":", $ENV{OLD_LIBPATH})')"