Bug 974216 - Set LIBXUL_LIBRARY for LIBRARY_NAME==xul; r=glandium

This commit is contained in:
Ehsan Akhgari 2014-02-18 22:20:51 -05:00
parent fd9925756b
commit 180500a2bb
2 changed files with 2 additions and 4 deletions

View File

@ -334,9 +334,9 @@ _ENABLE_PIC=1
# Determine if module being compiled is destined
# to be merged into libxul
ifeq ($(FINAL_LIBRARY),xul)
ifneq (,$(filter xul,$(FINAL_LIBRARY) $(LIBRARY_NAME)))
ifdef LIBXUL_LIBRARY
$(error FINAL_LIBRARY is "xul", LIBXUL_LIBRARY is implied)
$(error LIBRARY_NAME or FINAL_LIBRARY is "xul", LIBXUL_LIBRARY is implied)
endif
LIBXUL_LIBRARY := 1
endif

View File

@ -20,8 +20,6 @@ if CONFIG['OS_ARCH'] == 'WINNT':
'/xpcom/base',
]
DEFINES['MOZILLA_INTERNAL_API'] = True
# component libraries
additional_defines = (
'MOZ_AUTH_EXTENSION',