Changeset 265977 in webkit

Timestamp:

Aug 20, 2020, 3:55:55 PM (6 years ago)

Author:

James Savage

Message:

Could not find module 'WebKit' for target 'armv7-apple-ios'
<​https://bugs.webkit.org/show_bug.cgi?id=215190>
<rdar://problem/65642049>

Reviewed by Brady Eidson.

The config changes here got added to the wrong config file. They need to
be for the overlay, not its tests.

• SwiftOverlay/Configurations/WebKitSwiftOverlay.xcconfig:
• SwiftOverlay/Configurations/WebKitSwiftOverlayTests.xcconfig:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• SwiftOverlay/Configurations/WebKitSwiftOverlay.xcconfig (modified) (1 diff)
• SwiftOverlay/Configurations/WebKitSwiftOverlayTests.xcconfig (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-08-20  James Savage  <james.savage@apple.com>
+
+        Could not find module 'WebKit' for target 'armv7-apple-ios'
+        <https://bugs.webkit.org/show_bug.cgi?id=215190>
+        <rdar://problem/65642049>
+
+        Reviewed by Brady Eidson.
+
+        The config changes here got added to the wrong config file. They need to
+        be for the overlay, not its tests.
+
+        * SwiftOverlay/Configurations/WebKitSwiftOverlay.xcconfig:
+        * SwiftOverlay/Configurations/WebKitSwiftOverlayTests.xcconfig:
+
 2020-08-20  Aditya Keerthi  <akeerthi@apple.com>
 

trunk/Source/WebKit/SwiftOverlay/Configurations/WebKitSwiftOverlay.xcconfig

@@ -59 +59 @@
 SWIFT_INSTALL_MODULES = YES;
 SWIFT_MODULE_INSTALL_PATH = $(INSTALL_PATH);
+
+// We need to generate swiftmodules for these architectures, so that they can be
+// imported in apps that are deployable on OS versions that support them.
+// However, we can only generate module files for these; we can't emit binaries.
+// (All imported definitions will be unavailable on these older OS versions.)
+SWIFT_MODULE_ONLY_ARCHS[sdk=iphoneos*] = armv7 armv7s
+SWIFT_MODULE_ONLY_ARCHS[sdk=iphonesimulator*] = i386
+SWIFT_MODULE_ONLY_IPHONEOS_DEPLOYMENT_TARGET = 10.3
+SWIFT_MODULE_ONLY_ARCHS[sdk=watchos*] =
+SWIFT_MODULE_ONLY_ARCHS[sdk=watchsimulator*] =
+SWIFT_MODULE_ONLY_ARCHS[sdk=appletvos*] =
+SWIFT_MODULE_ONLY_ARCHS[sdk=appletvsimulator*] =

trunk/Source/WebKit/SwiftOverlay/Configurations/WebKitSwiftOverlayTests.xcconfig

@@ -45 +45 @@
 SDKROOT[sdk=appletv*] = appletvos.internal
 SDKROOT[sdk=watchos*] = watchos.internal
-
-// We need to generate swiftmodules for these architectures, so that they can be
-// imported in apps that are deployable on OS versions that support them.
-// However, we can only generate module files for these; we can't emit binaries.
-// (All imported definitions will be unavailable on these older OS versions.)
-SWIFT_MODULE_ONLY_ARCHS[sdk=iphoneos*] = armv7 armv7s
-SWIFT_MODULE_ONLY_ARCHS[sdk=iphonesimulator*] = i386
-SWIFT_MODULE_ONLY_IPHONEOS_DEPLOYMENT_TARGET = 10.3
-SWIFT_MODULE_ONLY_ARCHS[sdk=watchos*] =
-SWIFT_MODULE_ONLY_ARCHS[sdk=watchsimulator*] =
-SWIFT_MODULE_ONLY_ARCHS[sdk=appletvos*] =
-SWIFT_MODULE_ONLY_ARCHS[sdk=appletvsimulator*] =