Bug 1091118 - Part 1: Remove $topsrcdir/gcc/bin from PATH on android builds. r=gps, a=lmandel
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 30 Oct 2014 14:34:54 +0900
changeset 225870 49069150dab1
parent 225869 3554e60ef779
child 225871 16df73a8ddc1
push id4047
push userryanvm@gmail.com
push date2014-10-30 14:31 +0000
treeherdermozilla-beta@8f974876367e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps, lmandel
bugs1091118, 971841
milestone34.0
Bug 1091118 - Part 1: Remove $topsrcdir/gcc/bin from PATH on android builds. r=gps, a=lmandel $topsrcdir/gcc/bin was mistakenly added in bug 971841, but is not provided by anything the tooltool manifest for android builds pulls. It however is a path that /may/ exist in the source tree when the slave ran a linux build before. When it does exist, the meaning of non-path-prefixed commands change, influencing what particular compiler is used in some cases.
mobile/android/config/mozconfigs/common
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -47,9 +47,9 @@ export MOZ_PACKAGE_JSSHELL=1
 HOST_CC="/tools/gcc-4.7.2-0moz1/bin/gcc"
 HOST_CXX="/tools/gcc-4.7.2-0moz1/bin/g++"
 
 # Avoid dependency on libstdc++ 4.7
 ac_add_options --enable-stdcxx-compat
 
 mk_add_options "export ANT_HOME=$topsrcdir/apache-ant"
 
-mk_add_options "export PATH=$topsrcdir/gcc/bin:$topsrcdir/apache-ant/bin:$PATH"
+mk_add_options "export PATH=$topsrcdir/apache-ant/bin:$PATH"