Backout changeset ebeb331d66a8 r=backout
authorEdmund Wong <ewong@pw-wspx.org>
Fri, 31 Jul 2015 12:08:31 +0800
changeset 23009 513c9c62bfe6812dcea07f8be53b9f6b04ea75e2
parent 23008 ebeb331d66a8059881f34cf2d92b17a29b6ae4b7
child 23010 44f529e7dbc9f0db28ee9ed1d38b7768714a843e
push idunknown
push userunknown
push dateunknown
reviewersbackout
backs outebeb331d66a8059881f34cf2d92b17a29b6ae4b7
Backout changeset ebeb331d66a8 r=backout
suite/config/mozconfigs/linux32/debug
suite/config/mozconfigs/linux32/nightly
suite/config/mozconfigs/linux64/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
 
@@ -26,12 +21,8 @@ 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
@@ -33,12 +28,8 @@ 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/linux64/nightly
+++ b/suite/config/mozconfigs/linux64/nightly
@@ -1,15 +1,9 @@
 no_tooltool=1
-oldtopsrcdir=""
-if [ $topsrcdir == *"mozilla" ]; then
-  oldtopsrcdir=$topsrcdir
-  topsrcdir=$(dirname $topsrcdir)
-fi
-
 . "$topsrcdir/build/unix/mozconfig.linux"
 
 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
@@ -35,13 +29,8 @@ 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/lib64/pkgconfig:/usr/share/pkgconfig
 . "$topsrcdir/build/unix/mozconfig.gtk"
 
-if [ ! -z "$oldtopsrcdir" ]; then
-    topsrcdir=$oldtopsrcdir
-    oldtopsrcdir=""
-fi
-