Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2023-08-24 13:40:19 +08:00
commit edeec38e07
3 changed files with 14 additions and 5 deletions

View file

@ -314,6 +314,8 @@ def old_configure_options(*options):
'--enable-ldap', '--enable-ldap',
'--enable-mapi', '--enable-mapi',
'--enable-calendar', '--enable-calendar',
'--enable-inspector',
'--enable-irc',
'--enable-incomplete-external-linkage', '--enable-incomplete-external-linkage',
'--enable-mailnews', '--enable-mailnews',
'--enable-mailnews-oauth2', '--enable-mailnews-oauth2',

View file

@ -19,6 +19,13 @@ SOURCES += [
DEFINES['BUILDING_LIBHUNSPELL'] = True DEFINES['BUILDING_LIBHUNSPELL'] = True
# Hunspell must be built into libxul on SunOS. See UXP Issue #2290.
if CONFIG['OS_TARGET'] == 'SunOS':
FINAL_LIBRARY = 'xul'
else:
SharedLibrary('hunspell') SharedLibrary('hunspell')
USE_LIBS += [ USE_LIBS += [

View file

@ -196,7 +196,7 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
if CONFIG['MOZ_SYSTEM_HUNSPELL']: if CONFIG['MOZ_SYSTEM_HUNSPELL']:
OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
else: elif CONFIG['OS_TARGET'] != 'SunOS':
USE_LIBS += [ 'hunspell' ] USE_LIBS += [ 'hunspell' ]
if not CONFIG['MOZ_TREE_PIXMAN']: if not CONFIG['MOZ_TREE_PIXMAN']: