summaryrefslogtreecommitdiffstats
path: root/browser/confvars.sh
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-18 10:38:55 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-18 10:38:55 +0100
commit5839763c827cc35973e419026f926e9b8ffc118d (patch)
tree11fd29c791adc491430a7a9b516224c2a724868e /browser/confvars.sh
parent83c4b04a70d2319d4c292e7aa0c8872e7c1cd7fa (diff)
parent45f2fcd80d2a7d536e8b486c18415a337b56cb46 (diff)
downloadUXP-5839763c827cc35973e419026f926e9b8ffc118d.tar
UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar.gz
UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar.lz
UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar.xz
UXP-5839763c827cc35973e419026f926e9b8ffc118d.zip
Merge branch 'master' into ported-moebius
# Conflicts: # browser/installer/windows/nsis/stub.nsi
Diffstat (limited to 'browser/confvars.sh')
-rwxr-xr-xbrowser/confvars.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/browser/confvars.sh b/browser/confvars.sh
index d4c2c008d..65cf154e9 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -62,4 +62,8 @@ MOZ_ADDON_SIGNING=0
MOZ_REQUIRE_SIGNING=0
# Include the DevTools client, not just the server (which is the default)
-MOZ_DEVTOOLS=all
+if test -n "$BASILISK_DISABLE_DEVTOOLS" ; then
+MOZ_DEVTOOLS=
+else
+MOZ_DEVTOOLS=1
+fi