"make ARCHS=x86_64" fails to build
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 18 Jul 2016 16:17:52 +0000 (16:17 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 18 Jul 2016 16:17:52 +0000 (16:17 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@203348 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Makefile.shared

index 4ed407c..c9a637d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2016-07-18  Alexey Proskuryakov  <ap@apple.com>
+
+        "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  <cgarcia@igalia.com>
 
         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.13.3 release.
index af51bfa..b318440 100644 (file)
@@ -24,6 +24,13 @@ ifneq (,$(ARCHS))
        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