"make ARCHS=x86_64" fails to build

aproskuryakov · aproskuryakov · commit 32970db48241 · 2016-07-18T16:17:52.000Z
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. Canonical link: https://commits.webkit.org/178037@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@203348 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git 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.
diff --git a/Makefile.shared b/Makefile.shared
@@ -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
 
