Bug 1187222 - Removed unnecessary hacks. r+a=bustagefix in a CLOSED TREE
authorEdmund Wong <ewong@pw-wspx.org>
Sat, 26 Sep 2015 15:00:24 +0800
changeset 26377 a20361e72884377bd6834520a257b2dbaf807e75
parent 26376 7f6c79b88f190739a527dbfde50b6ee2234243ef
child 26378 2b0c1e1e6874a71b3ec69b8598e4b83898b26060
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1187222
Bug 1187222 - Removed unnecessary hacks. r+a=bustagefix in a CLOSED TREE
suite/config/mozconfigs/linux32/debug
suite/config/mozconfigs/linux32/nightly
--- a/suite/config/mozconfigs/linux32/debug
+++ b/suite/config/mozconfigs/linux32/debug
@@ -1,14 +1,9 @@
 no_tooltool=1
-if [[ $topsrcdir == *"mozilla"* ]]; then
-  oldtopsrcdir=$topsrcdir
-  topsrcdir=$(dirname $topsrcdir)
-fi
-
 . "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --enable-application=suite
 
 ac_add_options --enable-debug
 
 ac_add_options --enable-tests
 
@@ -23,16 +18,8 @@ mk_add_options PROFILE_GEN_SCRIPT='$(PYT
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
 
-export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
-. "$topsrcdir/build/unix/mozconfig.gtk"
-
-if [ ! -z "$oldtopsrcdir" ]; then
-  topsrcdir=$oldtopsrcdir
-  oldtopsrcdir=""
-fi
-
--- a/suite/config/mozconfigs/linux32/nightly
+++ b/suite/config/mozconfigs/linux32/nightly
@@ -1,14 +1,9 @@
 no_tooltool=1
-if [[ $topsrcdir == *"mozilla"* ]]; then
-  oldtopsrcdir=$topsrcdir
-  topsrcdir=$(dirname $topsrcdir)
-fi
-
 . "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
@@ -30,15 +25,8 @@ mk_add_options PROFILE_GEN_SCRIPT='$(PYT
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
 
-export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
-. "$topsrcdir/build/unix/mozconfig.gtk"
-
-if [ ! -z "$oldtopsrcdir" ]; then
-  topsrcdir=$oldtopsrcdir
-  oldtopsrcdir=""
-fi