summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorathenian200 <athenian200@outlook.com>2023-08-18 10:29:49 -0500
committerathenian200 <athenian200@outlook.com>2023-08-18 10:29:49 -0500
commit6d65f1d192a7b8810fa43dae189d302de2d0cf2f (patch)
tree2003d0fa13c1c6f22dc008a61f4f51efbece20e8
parent4ddaf0f4907afa8c95eca3a04ae90af290f95b8e (diff)
downloaduxp-6d65f1d192a7b8810fa43dae189d302de2d0cf2f.tar.gz
Issue #2290 - Hunspell must be built into libxul on SunOS.
-rw-r--r--extensions/spellcheck/hunspell/src/moz.build15
-rw-r--r--toolkit/library/moz.build2
2 files changed, 12 insertions, 5 deletions
diff --git a/extensions/spellcheck/hunspell/src/moz.build b/extensions/spellcheck/hunspell/src/moz.build
index 09764ec711..01f49ddd03 100644
--- a/extensions/spellcheck/hunspell/src/moz.build
+++ b/extensions/spellcheck/hunspell/src/moz.build
@@ -19,11 +19,18 @@ SOURCES += [
DEFINES['BUILDING_LIBHUNSPELL'] = True
-SharedLibrary('hunspell')
+# Hunspell must be built into libxul on SunOS. See UXP Issue #2290.
+if CONFIG['OS_TARGET'] == 'SunOS':
-USE_LIBS += [
- 'mozglue'
-]
+ FINAL_LIBRARY = 'xul'
+
+else:
+
+ SharedLibrary('hunspell')
+
+ USE_LIBS += [
+ 'mozglue'
+ ]
LOCAL_INCLUDES += [
'../glue',
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
index a80cf1dc73..d274cfa70b 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -196,7 +196,7 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
if CONFIG['MOZ_SYSTEM_HUNSPELL']:
OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
-else:
+elif CONFIG['OS_TARGET'] != 'SunOS':
USE_LIBS += [ 'hunspell' ]
if not CONFIG['MOZ_TREE_PIXMAN']: