Changeset 192106 in webkit


Ignore:
Timestamp:
Nov 6, 2015, 8:58:31 AM (9 years ago)
Author:
dbates@webkit.org
Message:

Teach Makefile to build LayoutTestRelay when building for iOS Simulator
​https://bugs.webkit.org/show_bug.cgi?id=150849

Reviewed by Alexey Proskuryakov.

.:

Add support for overriding the user-provided arguments SDKROOT and ARCHS
on a per Makefile basis.

  • Makefile.shared:

Tools:

Override the user-specified arguments SDKROOT and ARCHS to use the default SDK
and default ARCHS since LayoutTestRelay is a Mac command line tool.

  • LayoutTestRelay/Makefile: Define OVERWRITE_SDKROOT and OVERWRITE_ARCHS.
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r192097 r192106  
     12015-11-06  Daniel Bates  <dabates@apple.com>
     2
     3        Teach Makefile to build LayoutTestRelay when building for iOS Simulator
     4        https://bugs.webkit.org/show_bug.cgi?id=150849
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        Add support for overriding the user-provided arguments SDKROOT and ARCHS
     9        on a per Makefile basis.
     10
     11        * Makefile.shared:
     12
    1132015-11-06  Philippe Normand  <pnormand@igalia.com>
    214

  • trunk/Makefile.shared

    r191601 r192106  
    55
    66ifneq (,$(SDKROOT))
    7         XCODE_OPTIONS += SDKROOT=$(SDKROOT)
     7        ifneq (,$(OVERRIDE_SDKROOT))
     8                ifneq (default,$(OVERRIDE_SDKROOT))
     9                        XCODE_OPTIONS := $(XCODE_OPTIONS) SDKROOT=$(OVERRIDE_SDKROOT)
     10                endif
     11                OVERRIDE_SDKROOT =
     12        else
     13                XCODE_OPTIONS := $(XCODE_OPTIONS) SDKROOT=$(SDKROOT)
     14        endif
    815endif
    916
    1017ifneq (,$(ARCHS))
    11         XCODE_OPTIONS += ARCHS="$(ARCHS)"
    12         XCODE_OPTIONS += ONLY_ACTIVE_ARCH=NO
     18        ifneq (,$(OVERRIDE_ARCHS))
     19                ifneq (default,$(OVERRIDE_ARCHS))
     20                        XCODE_OPTIONS := $(XCODE_OPTIONS) ARCHS="$(OVERRIDE_ARCHS)"
     21                        XCODE_OPTIONS += ONLY_ACTIVE_ARCH=NO
     22                endif
     23                OVERRIDE_ARCHS =
     24        else
     25                XCODE_OPTIONS := $(XCODE_OPTIONS) ARCHS="$(ARCHS)"
     26                XCODE_OPTIONS += ONLY_ACTIVE_ARCH=NO
     27        endif
    1328endif
    1429

  • trunk/Tools/ChangeLog

    r192093 r192106  
     12015-11-06  Daniel Bates  <dabates@apple.com>
     2
     3        Teach Makefile to build LayoutTestRelay when building for iOS Simulator
     4        https://bugs.webkit.org/show_bug.cgi?id=150849
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        Override the user-specified arguments SDKROOT and ARCHS to use the default SDK
     9        and default ARCHS since LayoutTestRelay is a Mac command line tool.
     10
     11        * LayoutTestRelay/Makefile: Define OVERWRITE_SDKROOT and OVERWRITE_ARCHS.
     12
    1132015-11-05  Nikos Andronikos  <nikos.andronikos-webkit@cisra.canon.com.au>
    214

  • trunk/Tools/LayoutTestRelay/Makefile

    r192084 r192106  
    11SCRIPTS_PATH = ../Scripts
    22
     3OVERRIDE_ARCHS = default
     4OVERRIDE_SDKROOT = default
     5
    36include ../../Makefile.shared
Note: See TracChangeset for help on using the changeset viewer.