Bug 1257127 - [B2G] Fix HOST_CC/CXX paths for local builds r=glandium

MozReview-Commit-ID: E3NrLVMyCTe

--HG--
extra : rebase_source : 59fc7458599e97fdbf244c24167c2b50dd3c5dcc

b2g/config/mozconfigs/common

@@ -9,9 +9,9 @@
 # Normally, we'd set this unconditionally, but this file is also used
 # for local builds and there is no other mozconfig in this tree that
 # is included on device builds.
-if test -d $topsrcdir/../gcc/bin; then
-    HOST_CC="$topsrcdir/../gcc/bin/gcc"
-    HOST_CXX="$topsrcdir/../gcc/bin/g++"
+if test -d $topsrcdir/gcc/bin; then
+    HOST_CC="$topsrcdir/gcc/bin/gcc"
+    HOST_CXX="$topsrcdir/gcc/bin/g++"
     ac_add_options --enable-stdcxx-compat
 fi
 

testing/taskcluster/scripts/builder/install-packages.sh

@@ -11,5 +11,3 @@ tc-vcs checkout $gecko_dir/tooltool $TOOLTOOL_REPO $TOOLTOOL_REPO $TOOLTOOL_REV
 
 (cd $gecko_dir; python $gecko_dir/tooltool/tooltool.py --url https://api.pub.build.mozilla.org/tooltool/ -m $gecko_dir/$TOOLTOOL_MANIFEST fetch -c $TOOLTOOL_CACHE)
 
-# Another terrible hack..
-(ls $gecko_dir/gcc/bin/gcc && ln -s $gecko_dir/gcc/bin/gcc $gecko_dir/gcc/bin/cc)