Bug 837570 - Fix OSX64 buildage from |Bug 780561 - (new-packager) Overhaul the packager| r=ewong, r=bustage for a CLOSED TREE
authorJustin Wood <Callek@gmail.com>
Mon, 04 Feb 2013 03:32:21 -0500
changeset 11874 ca30e347561c7256dcd7c32a3949349bf7ada1fd
parent 11873 511e66705f3fc1fa1ba9e9e10728605bc3b0a9be
child 11875 f001d24bdf238e3ffb6ca41b54975e83e831802a
push id8850
push userCallek@gmail.com
push dateMon, 04 Feb 2013 08:32:36 +0000
treeherdercomm-central@ca30e347561c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersewong, bustage
bugs837570, 780561
Bug 837570 - Fix OSX64 buildage from |Bug 780561 - (new-packager) Overhaul the packager| r=ewong, r=bustage for a CLOSED TREE
suite/config/mozconfigs/macosx-universal/l10n-mozconfig
suite/config/mozconfigs/macosx-universal/nightly
suite/config/mozconfigs/macosx-universal/release
suite/config/mozconfigs/macosx-universal/release-l10n
--- a/suite/config/mozconfigs/macosx-universal/l10n-mozconfig
+++ b/suite/config/mozconfigs/macosx-universal/l10n-mozconfig
@@ -1,28 +1,19 @@
-if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-  # We need some hackery to deal with the mozilla/ build system calling this
-  # mozconfig.
-  oldtopsrcdir=$topsrcdir
-  export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
+# Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
+# mixed up with host/target CPUs when trying to work out how to do the
+# universal build. When we redo the build system (bug 648979) this will
+# go away.
+if test -e "$topsrcdir/suite/config/version.txt"; then
   unset CC
   unset CXX
 fi
 
 . $topsrcdir/build/macosx/universal/mozconfig
 
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
 ac_add_options --enable-application=suite
 ac_add_options --with-l10n-base=../../l10n-central
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --disable-install-strip
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
--- a/suite/config/mozconfigs/macosx-universal/nightly
+++ b/suite/config/mozconfigs/macosx-universal/nightly
@@ -1,28 +1,19 @@
-if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-  # We need some hackery to deal with the mozilla/ build system calling this
-  # mozconfig.
-  oldtopsrcdir=$topsrcdir
-  export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
+# Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
+# mixed up with host/target CPUs when trying to work out how to do the
+# universal build. When we redo the build system (bug 648979) this will
+# go away.
+if test -e "$topsrcdir/suite/config/version.txt"; then
   unset CC
   unset CXX
 fi
 
 . $topsrcdir/build/macosx/universal/mozconfig
 
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-tests
 ac_add_options --enable-codesighs
 ac_add_options --disable-install-strip
 
 export CFLAGS="-gdwarf-2"
--- a/suite/config/mozconfigs/macosx-universal/release
+++ b/suite/config/mozconfigs/macosx-universal/release
@@ -1,28 +1,19 @@
-if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-  # We need some hackery to deal with the mozilla/ build system calling this
-  # mozconfig.
-  oldtopsrcdir=$topsrcdir
-  export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
+# Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
+# mixed up with host/target CPUs when trying to work out how to do the
+# universal build. When we redo the build system (bug 648979) this will
+# go away.
+if test -e "$topsrcdir/suite/config/version.txt"; then
   unset CC
   unset CXX
 fi
 
 . $topsrcdir/build/macosx/universal/mozconfig
 
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-tests
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
--- a/suite/config/mozconfigs/macosx-universal/release-l10n
+++ b/suite/config/mozconfigs/macosx-universal/release-l10n
@@ -1,28 +1,19 @@
-if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-  # We need some hackery to deal with the mozilla/ build system calling this
-  # mozconfig.
-  oldtopsrcdir=$topsrcdir
-  export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
+# Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
+# mixed up with host/target CPUs when trying to work out how to do the
+# universal build. When we redo the build system (bug 648979) this will
+# go away.
+if test -e "$topsrcdir/suite/config/version.txt"; then
   unset CC
   unset CXX
 fi
 
 . $topsrcdir/build/macosx/universal/mozconfig
 
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
 if [ "$MOZ_UPDATE_CHANNEL" == "beta" ]; then
   ac_add_options --with-l10n-base=../../releases/l10n/mozilla-beta
 fi;
 if [ "$MOZ_UPDATE_CHANNEL" == "release" ]; then
   ac_add_options --with-l10n-base=../../releases/l10n/mozilla-release
 fi;
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}