Title: [229204] trunk/Source/WebKit
- Revision
- 229204
- Author
- [email protected]
- Date
- 2018-03-04 11:37:23 -0800 (Sun, 04 Mar 2018)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (229203 => 229204)
--- trunk/Source/WebKit/ChangeLog 2018-03-04 16:56:06 UTC (rev 229203)
+++ trunk/Source/WebKit/ChangeLog 2018-03-04 19:37:23 UTC (rev 229204)
@@ -1,3 +1,13 @@
+2018-03-04 Dan Bernstein <[email protected]>
+
+ 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 <[email protected]>
Notify the NetworkProcess when a session is servicing an automation client
Modified: trunk/Source/WebKit/Configurations/PluginService.32.xcconfig (229203 => 229204)
--- trunk/Source/WebKit/Configurations/PluginService.32.xcconfig 2018-03-04 16:56:06 UTC (rev 229203)
+++ trunk/Source/WebKit/Configurations/PluginService.32.xcconfig 2018-03-04 19:37:23 UTC (rev 229204)
@@ -23,7 +23,10 @@
#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;
PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
@@ -34,4 +37,8 @@
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;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
