Title: [203348] trunk
- Revision
- 203348
- Author
- [email protected]
- Date
- 2016-07-18 09:17:52 -0700 (Mon, 18 Jul 2016)
Log Message
"make ARCHS=x86_64" fails to build
https://bugs.webkit.org/show_bug.cgi?id=159867
Reviewed by Dan Bernstein.
* Makefile.shared: Override VALID_ARCHS when ARCHS is set, so that even projects
that normally customize VALID_ARCHS wouldn't fail to build.
Modified Paths
Diff
Modified: trunk/ChangeLog (203347 => 203348)
--- trunk/ChangeLog 2016-07-18 13:41:07 UTC (rev 203347)
+++ trunk/ChangeLog 2016-07-18 16:17:52 UTC (rev 203348)
@@ -1,3 +1,13 @@
+2016-07-18 Alexey Proskuryakov <[email protected]>
+
+ "make ARCHS=x86_64" fails to build
+ https://bugs.webkit.org/show_bug.cgi?id=159867
+
+ Reviewed by Dan Bernstein.
+
+ * Makefile.shared: Override VALID_ARCHS when ARCHS is set, so that even projects
+ that normally customize VALID_ARCHS wouldn't fail to build.
+
2016-07-18 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.13.3 release.
Modified: trunk/Makefile.shared (203347 => 203348)
--- trunk/Makefile.shared 2016-07-18 13:41:07 UTC (rev 203347)
+++ trunk/Makefile.shared 2016-07-18 16:17:52 UTC (rev 203348)
@@ -24,6 +24,13 @@
else
XCODE_OPTIONS := $(XCODE_OPTIONS) ARCHS="$(ARCHS)"
XCODE_OPTIONS += _ONLY_ACTIVE_ARCH_=NO
+ # Make Plugin.32 and Plugin.64 build even when they can't be built for the specified architecture.
+ ifeq ($(ARCHS),i386)
+ XCODE_OPTIONS += VALID_ARCHS=i386
+ endif
+ ifeq ($(ARCHS),x86_64)
+ XCODE_OPTIONS += VALID_ARCHS=x86_64
+ endif
endif
endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
