Bug 1091118 part 1 - Remove $topsrcdir/gcc/bin from PATH on android builds. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 30 Oct 2014 14:34:54 +0900
changeset 213066 ed34888e6a483e813ca31f6ec412bef87892fc5b
parent 213065 1aa71eb718f7534a5ee8d8657a91c09c1f6225bd
child 213067 0fe6218eec33e10ebffdaf9ad89b1f021c1b29d6
push id27738
push usercbook@mozilla.com
push dateThu, 30 Oct 2014 13:46:07 +0000
treeherdermozilla-central@1aa1b23d799e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1091118, 971841
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1091118 part 1 - Remove $topsrcdir/gcc/bin from PATH on android builds. r=gps $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"