Title: [255086] trunk/Source/_javascript_Core
Revision
255086
Author
[email protected]
Date
2020-01-24 12:00:16 -0800 (Fri, 24 Jan 2020)

Log Message

JSC should produce a module map.
https://bugs.webkit.org/show_bug.cgi?id=206717

Reviewed by Mark Lam.

* Configurations/_javascript_Core.xcconfig:
* _javascript_Core.modulemap:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (255085 => 255086)


--- trunk/Source/_javascript_Core/ChangeLog	2020-01-24 19:33:24 UTC (rev 255085)
+++ trunk/Source/_javascript_Core/ChangeLog	2020-01-24 20:00:16 UTC (rev 255086)
@@ -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/_javascript_Core.xcconfig:
+        * _javascript_Core.modulemap:
+
 2020-01-24  Commit Queue  <[email protected]>
 
         Unreviewed, rolling out r255052.

Modified: trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (255085 => 255086)


--- trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2020-01-24 19:33:24 UTC (rev 255085)
+++ trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2020-01-24 20:00:16 UTC (rev 255086)
@@ -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)/_javascript_Core.modulemap;
 
 // Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.

Modified: trunk/Source/_javascript_Core/_javascript_Core.modulemap (255085 => 255086)


--- trunk/Source/_javascript_Core/_javascript_Core.modulemap	2020-01-24 19:33:24 UTC (rev 255085)
+++ trunk/Source/_javascript_Core/_javascript_Core.modulemap	2020-01-24 20:00:16 UTC (rev 255086)
@@ -1,4 +1,4 @@
-framework module _javascript_Core {
+framework module _javascript_Core [extern_c] {
   umbrella header "_javascript_Core.h"
 
   export *
@@ -5,14 +5,4 @@
   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"
-  }
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to