mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-21 09:15:35 +00:00
fdf0cf5124
The conditions under which verifymar is built were not aligned with what kind of setups are actually doing something. For instance --disable-signmar --enable-verify-mar was building the verifymar library but not doing anything with it. OTOH, building with --enable-signmar --disable-verify-mar did build it but its code was eliminated at link time because it's unused. Finally, the conditions between modules/libmar/verify/moz.build and toolkit/mozapps/update/updater/updater-common.build weren't aligned and broke some non-Linux tier-3 platforms. We remedy the latter by moving the flags and libraries verifymar needs to verifymar, so that things that link verifymar inherit them. And while in the vicinity, replace a use of NSPR_LIBS with the pseudo-library `nspr` which has the same effect. Differential Revision: https://phabricator.services.mozilla.com/D34620 --HG-- extra : moz-landing-system : lando
21 lines
621 B
Python
21 lines
621 B
Python
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
|
# vim: set filetype=python:
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# 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/.
|
|
|
|
with Files('**'):
|
|
BUG_COMPONENT = ('Toolkit', 'Application Update')
|
|
|
|
DIRS += ['src']
|
|
|
|
if CONFIG['MOZ_ENABLE_SIGNMAR']:
|
|
DIRS += ['sign']
|
|
TEST_DIRS += ['tests']
|
|
if CONFIG['MOZ_VERIFY_MAR_SIGNATURE']:
|
|
DIRS += ['verify']
|
|
|
|
# If we are building ./sign and ./verify then ./tool must come after it
|
|
DIRS += ['tool']
|
|
|