Keep build/ in sync: Bug 1262057 - Find gcc using TOOLTOOL_DIR. rs=bustage-fix CLOSED TREE

--HG--
extra : rebase_source : 1ea3570e0d9cf0893cf6c721e26e2c834ca1b53c

build/unix/mozconfig.linux

@@ -7,18 +7,20 @@ fi
 
 . "$topsrcdir/build/mozconfig.common"
 
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
 # some b2g desktop builds still happen on i686 machines, and the tooltool
 # toolchain is x86_64 only.
 # We also deal with valgrind builds here, they don't use tooltool manifests at
 # all yet.
 if [ -z "$no_tooltool" ]
 then
-  CC="$topsrcdir/gcc/bin/gcc"
-  CXX="$topsrcdir/gcc/bin/g++"
+  CC="$TOOLTOOL_DIR/gcc/bin/gcc"
+  CXX="$TOOLTOOL_DIR/gcc/bin/g++"
 
   # We want to make sure we use binutils and other binaries in the tooltool
   # package.
-  mk_add_options PATH="$topsrcdir/gcc/bin:$PATH"
+  mk_add_options PATH="$TOOLTOOL_DIR/gcc/bin:$PATH"
 else
   CC="/tools/gcc-4.7.3-0moz1/bin/gcc"
   CXX="/tools/gcc-4.7.3-0moz1/bin/g++"