JSC should produce a module map.

https://bugs.webkit.org/show_bug.cgi?id=206717

Reviewed by Mark Lam.

* Configurations/JavaScriptCore.xcconfig:
* JavaScriptCore.modulemap:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@255086 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Author: [email protected]

Source/JavaScriptCore/ChangeLog

@@ -1,3 +1,13 @@
+2020-01-24  Keith Miller  <[email protected]>
+
+        JSC should produce a module map.
+        https://bugs.webkit.org/show_bug.cgi?id=206717
+
+        Reviewed by Mark Lam.
+
+        * Configurations/JavaScriptCore.xcconfig:
+        * JavaScriptCore.modulemap:
+
 2020-01-24  Commit Queue  <[email protected]>
 
         Unreviewed, rolling out r255052.

Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig

@@ -24,10 +24,7 @@
 #include "FeatureDefines.xcconfig"
 #include "Version.xcconfig"
 
-DEFINES_MODULE = $(DEFINES_MODULE_$(WK_PLATFORM_NAME))
-DEFINES_MODULE_maccatalyst = YES;
-DEFINES_MODULE_macosx = YES;
-DEFINES_MODULE_ = NO;
+DEFINES_MODULE = YES;
 MODULEMAP_FILE = $(SRCROOT)/JavaScriptCore.modulemap;
 
 // Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.

Source/JavaScriptCore/JavaScriptCore.modulemap

@@ -1,18 +1,8 @@
-framework module JavaScriptCore {
+framework module JavaScriptCore [extern_c] {
   umbrella header "JavaScriptCore.h"
 
   export *
   module * {
     export *
   }
-
-  explicit module JSVirtualMachine {
-    // FIXME: 32-bit x86 is a poor way to say "fragile Objective-C ABI"
-    requires x86_32
-    exclude header "JSValue.h"
-    exclude header "JSContext.h"
-    exclude header "JSExport.h"
-    exclude header "JSManagedValue.h"
-    exclude header "JSVirtualMachine.h"
-  }
 }