diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-18 10:38:55 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-18 10:38:55 +0100 |
| commit | 5839763c827cc35973e419026f926e9b8ffc118d (patch) | |
| tree | 11fd29c791adc491430a7a9b516224c2a724868e /devtools/moz.build | |
| parent | 83c4b04a70d2319d4c292e7aa0c8872e7c1cd7fa (diff) | |
| parent | 45f2fcd80d2a7d536e8b486c18415a337b56cb46 (diff) | |
| download | UXP-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 'devtools/moz.build')
| -rw-r--r-- | devtools/moz.build | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/devtools/moz.build b/devtools/moz.build index 79787d019..8e368facb 100644 --- a/devtools/moz.build +++ b/devtools/moz.build @@ -4,13 +4,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -if CONFIG['MOZ_DEVTOOLS'] and CONFIG['MOZ_DEVTOOLS'] not in ('all', 'server'): - error('Unsupported MOZ_DEVTOOLS value: %s' % (CONFIG['MOZ_DEVTOOLS'])) +if CONFIG['MOZ_DEVTOOLS']: + DIRS += ['client'] -if CONFIG['MOZ_DEVTOOLS'] == 'all': - DIRS += [ - 'client', - ] DIRS += [ 'server', |