Changeset 203348 in webkit


Ignore:
Timestamp:
Jul 18, 2016, 9:17:52 AM (9 years ago)
Author:
ap@apple.com
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.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r203344 r203348  
     12016-07-18  Alexey Proskuryakov  <ap@apple.com>
     2
     3        "make ARCHS=x86_64" fails to build
     4        https://bugs.webkit.org/show_bug.cgi?id=159867
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * Makefile.shared: Override VALID_ARCHS when ARCHS is set, so that even projects
     9        that normally customize VALID_ARCHS wouldn't fail to build.
     10
    1112016-07-18  Carlos Garcia Campos  <cgarcia@igalia.com>
    212

  • trunk/Makefile.shared

    r202798 r203348  
    2525                XCODE_OPTIONS := $(XCODE_OPTIONS) ARCHS="$(ARCHS)"
    2626                XCODE_OPTIONS += ONLY_ACTIVE_ARCH=NO
     27                # Make Plugin.32 and Plugin.64 build even when they can't be built for the specified architecture.
     28                ifeq ($(ARCHS),i386)
     29                        XCODE_OPTIONS += VALID_ARCHS=i386
     30                endif
     31                ifeq ($(ARCHS),x86_64)
     32                        XCODE_OPTIONS += VALID_ARCHS=x86_64
     33                endif
    2734        endif
    2835endif
Note: See TracChangeset for help on using the changeset viewer.