Changeset 229204 in webkit

Timestamp:

Mar 4, 2018, 11:37:23 AM (8 years ago)

Author:

mitz@apple.com

Message:

Building with ONLY_ACTIVE_ARCH=NO and ARCHS=x86_64 fails
​https://bugs.webkit.org/show_bug.cgi?id=183320

Reviewed by Tim Horton.

• Configurations/PluginService.32.xcconfig: If the Apple build tool specifies RC_ARCHS=x86_64, then let the service build for x86_64, but don’t install it.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Configurations/PluginService.32.xcconfig (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-03-04  Dan Bernstein  <mitz@apple.com>
+
+        Building with ONLY_ACTIVE_ARCH=NO and ARCHS=x86_64 fails
+        https://bugs.webkit.org/show_bug.cgi?id=183320
+
+        Reviewed by Tim Horton.
+
+        * Configurations/PluginService.32.xcconfig: If the Apple build tool specifies
+          RC_ARCHS=x86_64, then let the service build for x86_64, but don’t install it.
+
 2018-03-03  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit/Configurations/PluginService.32.xcconfig

@@ -24 +24 @@
 #include "BaseXPCService.xcconfig"
 
-VALID_ARCHS_macosx_NO = i386;
+VALID_ARCHS_macosx_NO = $(VALID_ARCHS_BUILDING_ONLY_X86_64_$(WK_BUILDING_ONLY_X86_64));
+VALID_ARCHS_BUILDING_ONLY_X86_64_ = $(VALID_ARCHS_BUILDING_ONLY_X86_64_NO);
+VALID_ARCHS_BUILDING_ONLY_X86_64_NO = i386;
+VALID_ARCHS_BUILDING_ONLY_X86_64_YES = $(VALID_ARCHS);
 
 PRODUCT_NAME = com.apple.WebKit.Plugin.32;
@@ -35 +38 @@
 CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
 
+SKIP_INSTALL = $(WK_BUILDING_ONLY_X86_64);
 SKIP_INSTALL[sdk=iphone*] = YES;
+
+WK_BUILDING_ONLY_X86_64 = $(WK_BUILDING_ONLY_X86_64_$(RC_ARCHS:identifier));
+WK_BUILDING_ONLY_X86_64_x86_64 = YES;