mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-01 17:23:59 +00:00
Keep changeset 6a70000360a0 backed out on the reverted tree
This commit is contained in:
parent
b68262a622
commit
2c5d1e8130
@ -397,18 +397,8 @@ endif
|
||||
|
||||
ifdef MOZ_OMNIJAR
|
||||
|
||||
# Set MOZ_CAN_RUN_PROGRAMS for trivial cases.
|
||||
ifndef MOZ_CAN_RUN_PROGRAMS
|
||||
ifdef UNIVERSAL_BINARY
|
||||
MOZ_CAN_RUN_PROGRAMS=1
|
||||
endif
|
||||
ifndef CROSS_COMPILE
|
||||
MOZ_CAN_RUN_PROGRAMS=1
|
||||
endif
|
||||
endif # MOZ_CAN_RUN_PROGRAMS
|
||||
|
||||
ifdef GENERATE_CACHE
|
||||
ifdef MOZ_CAN_RUN_PROGRAMS
|
||||
ifneq (1_,$(if $(CROSS_COMPILE),1,0)_$(UNIVERSAL_BINARY))
|
||||
ifdef RUN_TEST_PROGRAM
|
||||
_ABS_RUN_TEST_PROGRAM = $(call core_abspath,$(RUN_TEST_PROGRAM))
|
||||
endif
|
||||
@ -487,7 +477,7 @@ endif
|
||||
|
||||
# dummy macro if we don't have PSM built
|
||||
SIGN_NSS =
|
||||
ifdef MOZ_CAN_RUN_PROGRAMS
|
||||
ifneq (1_,$(if $(CROSS_COMPILE),1,0)_$(UNIVERSAL_BINARY))
|
||||
ifdef MOZ_PSM
|
||||
SIGN_NSS = @echo signing nss libraries;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user