bug 806548 - sync 32bit and 64bit linux desktop b2g mozconfigs rs=cjones DONTBUILD because NPOTB
authorJohn Ford <jhford@mozilla.com>
Mon, 29 Oct 2012 14:01:18 -0700
changeset 111815 e13300fe685d67b9bef031361767ff9d05b914aa
parent 111814 f677f91c89c057cc63f40c94c7b52602724c91b5
child 111816 e19e170d2f6d620b83ba42e8220b1717e0d6c037
child 111835 f3c7eef2b69f7fcd965c4db909282e50cf22711b
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
reviewerscjones
bugs806548
milestone19.0a1
bug 806548 - sync 32bit and 64bit linux desktop b2g mozconfigs rs=cjones DONTBUILD because NPOTB
b2g/config/mozconfigs/linux64_gecko/nightly
--- a/b2g/config/mozconfigs/linux64_gecko/nightly
+++ b/b2g/config/mozconfigs/linux64_gecko/nightly
@@ -1,17 +1,17 @@
+. "$topsrcdir/b2g/config/mozconfigs/common"
+
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-codesighs
 ac_add_options --enable-signmar
 
 # Nightlies only since this has a cost in performance
-ac_add_options --enable-js-diagnostics
-
-. $topsrcdir/build/unix/mozconfig.linux
+#ac_add_options --enable-js-diagnostics
 
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 # IonMonkey disabled in bug 789373
 ac_add_options --disable-ion
 
 # This will overwrite the default of stripping everything and keep the symbol table.