From b171da18f99552f0168469855a8a735af1044a0e Mon Sep 17 00:00:00 2001
From: Job Bautista <jobbautista9@aol.com>
Date: Thu, 16 Mar 2023 13:51:38 +0800
Subject: [PATCH] Issue #62 - Get --enable-shared-js and --enable-export-js
 working again, and fix link bustage related to ICU when doing shared lib

---
 js/src/moz.build | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/js/src/moz.build b/js/src/moz.build
index 7a2d896600..e14d59b350 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -611,11 +611,15 @@ if CONFIG['JS_SHARED_LIBRARY']:
     GeckoSharedLibrary('js', linkage=None)
     SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME']
     SDK_LIBRARY = True
+    if CONFIG['MOZ_ICU_DATA_ARCHIVE']:
+        USE_LIBS += [
+             'icudata',
+        ]
 else:
     Library('js')
-
-FORCE_STATIC_LIB = True
-STATIC_LIBRARY_NAME = 'js_static'
+    FORCE_STATIC_LIB = True
+    STATIC_LIBRARY_NAME = 'js_static'
+    NO_EXPAND_LIBS = True
 
 if not CONFIG['MOZ_ICU_DATA_ARCHIVE']:
     USE_LIBS += [
@@ -660,8 +664,6 @@ if CONFIG['OS_ARCH'] == 'SunOS':
 
 OS_LIBS += CONFIG['REALTIME_LIBS']
 
-NO_EXPAND_LIBS = True
-
 DIST_INSTALL = True
 
 # Prepare self-hosted JS code for embedding