Title: [271260] trunk
- Revision
- 271260
- Author
- [email protected]
- Date
- 2021-01-07 14:30:26 -0800 (Thu, 07 Jan 2021)
Log 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 <[email protected]> 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:
Modified Paths
Diff
Modified: trunk/ChangeLog (271259 => 271260)
--- trunk/ChangeLog 2021-01-07 22:06:19 UTC (rev 271259)
+++ trunk/ChangeLog 2021-01-07 22:30:26 UTC (rev 271260)
@@ -1,3 +1,15 @@
+2021-01-07 Ryan Hostetler <[email protected]>
+
+ make clean/installsrc fail: You cannot specify -alltargets and also specify individual targets.
+ https://bugs.webkit.org/show_bug.cgi?id=220370
+ rdar://72834872
+
+ Reviewed by Andy Estes.
+
+ Update hardcoded '-alltargets' to use new XCODE_TARGET variable.
+
+ * Makefile.shared:
+
2021-01-07 Monson Shao <[email protected]>
[CMake] Add USE_APPLE_ICU option
Modified: trunk/Makefile.shared (271259 => 271260)
--- trunk/Makefile.shared 2021-01-07 22:06:19 UTC (rev 271259)
+++ trunk/Makefile.shared 2021-01-07 22:30:26 UTC (rev 271260)
@@ -102,7 +102,7 @@
echo; \
echo "===== BUILDING $$(basename "$$(pwd)") ====="; \
echo; \
- $1 xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) $2 | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} \
+ $1 xcodebuild $(OTHER_OPTIONS) $(XCODE_TARGET) $(XCODE_OPTIONS) $2 | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} \
)
endef
@@ -137,9 +137,17 @@
endif
clean:
+ifndef XCODE_TARGET
@$(call invoke_xcode,,-alltargets clean)
+else
+ @$(call invoke_xcode,,clean)
+endif
installsrc:
+ifndef XCODE_TARGET
@$(call invoke_xcode,,-alltargets installsrc SRCROOT="$(SRCROOT)$(PATH_FROM_ROOT)")
+else
+ @$(call invoke_xcode,,installsrc SRCROOT="$(SRCROOT)$(PATH_FROM_ROOT)")
+endif
force: ;
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (271259 => 271260)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2021-01-07 22:06:19 UTC (rev 271259)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2021-01-07 22:30:26 UTC (rev 271260)
@@ -1,3 +1,15 @@
+2021-01-07 Ryan Hostetler <[email protected]>
+
+ make clean/installsrc fail: You cannot specify -alltargets and also specify individual targets.
+ https://bugs.webkit.org/show_bug.cgi?id=220370
+ rdar://72834872
+
+ Reviewed by Andy Estes.
+
+ Use new XCODE_TARGET variable to set boringssl target on watchOS builds.
+
+ * Makefile:
+
2021-01-07 Youenn Fablet <[email protected]>
Remove non-inclusive language from libwebrtc
Modified: trunk/Source/ThirdParty/libwebrtc/Makefile (271259 => 271260)
--- trunk/Source/ThirdParty/libwebrtc/Makefile 2021-01-07 22:06:19 UTC (rev 271259)
+++ trunk/Source/ThirdParty/libwebrtc/Makefile 2021-01-07 22:30:26 UTC (rev 271260)
@@ -2,7 +2,7 @@
ifneq (,$(SDKROOT))
ifneq (,$(findstring watch,$(call TO_LOWER,$(notdir $(SDKROOT)))))
- OTHER_OPTIONS += -target boringssl
+ XCODE_TARGET = -target boringssl
endif
endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
