Bug 1522761 - Use CC_TYPE in C-C build files. mail/ and mailnews/ part. r=rjl
Ports: Bug 1031352 [move most of the _MSC_VER references in Makefile.in to moz.build]. Bug 1394734 [Replace CONFIG['CLANG_CXX'], CONFIG['GNU_CXX'] by CONFIG['CC_TYPE']].
This commit is contained in:
Родитель
521675d55c
Коммит
9fa3e51c23
|
@ -55,7 +55,7 @@ if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
|
|||
# The heap will grow if need be.
|
||||
#
|
||||
# Set it to 256k. See bug 127069.
|
||||
if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']:
|
||||
if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
|
||||
LDFLAGS += ['/HEAP:0x40000']
|
||||
|
||||
DisableStlWrapping()
|
||||
|
|
|
@ -50,10 +50,6 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk3)
|
|||
DEFINES += -DMOZ_GTK=1
|
||||
endif
|
||||
|
||||
ifdef _MSC_VER
|
||||
DEFINES += -D_MSC_VER=$(_MSC_VER)
|
||||
endif
|
||||
|
||||
ifdef MOZ_SYSTEM_NSPR
|
||||
DEFINES += -DMOZ_SYSTEM_NSPR=1
|
||||
endif
|
||||
|
|
|
@ -36,7 +36,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
|
|||
if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
LOCAL_INCLUDES += [
|
||||
]
|
||||
if not CONFIG['GNU_CC']:
|
||||
if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
|
||||
LOCAL_INCLUDES += [
|
||||
'../becky/src',
|
||||
'../outlook/src',
|
||||
|
|
|
@ -35,7 +35,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
|
|||
if CONFIG['MOZ_MAPI_SUPPORT']:
|
||||
DIRS += ['import/outlook/src']
|
||||
|
||||
if not CONFIG['GNU_CC']:
|
||||
if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
|
||||
DIRS += [
|
||||
'import/winlivemail',
|
||||
]
|
||||
|
|
Загрузка…
Ссылка в новой задаче