⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 271260 in webkit


Ignore:
Timestamp:
Jan 7, 2021, 2:30:26 PM (6 years ago)
Author:
commit-queue@webkit.org
Message:

make clean/installsrc fail: You cannot specify -alltargets and also specify individual targets.
​https://bugs.webkit.org/show_bug.cgi?id=220370
rdar://72834872

Patch by Ryan Hostetler <​rhost@apple.com> on 2021-01-07
Reviewed by Andy Estes.

.:

Update hardcoded '-alltargets' to use new XCODE_TARGET variable.

  • Makefile.shared:

Source/ThirdParty/libwebrtc:

Use new XCODE_TARGET variable to set boringssl target on watchOS builds.

  • Makefile:
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r271257 r271260  
     12021-01-07  Ryan Hostetler  <rhost@apple.com>
     2
     3        make clean/installsrc fail: You cannot specify -alltargets and also specify individual targets.
     4        https://bugs.webkit.org/show_bug.cgi?id=220370
     5        rdar://72834872
     6
     7        Reviewed by Andy Estes.
     8
     9        Update hardcoded '-alltargets' to use new XCODE_TARGET variable.
     10
     11        * Makefile.shared:
     12
    1132021-01-07  Monson Shao  <holymonson@gmail.com>
    214

  • trunk/Makefile.shared

    r267949 r271260  
    103103                echo "===== BUILDING $$(basename "$$(pwd)") ====="; \
    104104                echo; \
    105                 $1 xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) $2 | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} \
     105                $1 xcodebuild $(OTHER_OPTIONS) $(XCODE_TARGET) $(XCODE_OPTIONS) $2 | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} \
    106106        )
    107107endef
    … …  
    138138
    139139clean:
     140ifndef XCODE_TARGET
    140141        @$(call invoke_xcode,,-alltargets clean)
     142else
     143        @$(call invoke_xcode,,clean)
     144endif
    141145
    142146installsrc:
     147ifndef XCODE_TARGET
    143148        @$(call invoke_xcode,,-alltargets installsrc SRCROOT="$(SRCROOT)$(PATH_FROM_ROOT)")
     149else
     150        @$(call invoke_xcode,,installsrc SRCROOT="$(SRCROOT)$(PATH_FROM_ROOT)")
     151endif
    144152
    145153force: ;

  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r271227 r271260  
     12021-01-07  Ryan Hostetler  <rhost@apple.com>
     2
     3        make clean/installsrc fail: You cannot specify -alltargets and also specify individual targets.
     4        https://bugs.webkit.org/show_bug.cgi?id=220370
     5        rdar://72834872
     6
     7        Reviewed by Andy Estes.
     8
     9        Use new XCODE_TARGET variable to set boringssl target on watchOS builds.
     10
     11        * Makefile:
     12
    1132021-01-07  Youenn Fablet  <youenn@apple.com>
    214

  • trunk/Source/ThirdParty/libwebrtc/Makefile

    r271037 r271260  
    33ifneq (,$(SDKROOT))
    44        ifneq (,$(findstring watch,$(call TO_LOWER,$(notdir $(SDKROOT)))))
    5                 OTHER_OPTIONS += -target boringssl
     5                XCODE_TARGET = -target boringssl
    66        endif
    77endif
Note: See TracChangeset for help on using the changeset viewer.