Title: [280453] trunk/Tools
- Revision
- 280453
- Author
- [email protected]
- Date
- 2021-07-29 15:52:27 -0700 (Thu, 29 Jul 2021)
Log Message
Simplify ImageDiff SDK logic
https://bugs.webkit.org/show_bug.cgi?id=228603
<rdar://problem/81281548>
Reviewed by Sam Weinig.
* ImageDiff/Makefile:
For any non-macOS SDK, build a macOS ImageDiff (because we use it on the host, not the target).
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (280452 => 280453)
--- trunk/Tools/ChangeLog 2021-07-29 22:26:13 UTC (rev 280452)
+++ trunk/Tools/ChangeLog 2021-07-29 22:52:27 UTC (rev 280453)
@@ -1,3 +1,14 @@
+2021-07-29 Tim Horton <[email protected]>
+
+ Simplify ImageDiff SDK logic
+ https://bugs.webkit.org/show_bug.cgi?id=228603
+ <rdar://problem/81281548>
+
+ Reviewed by Sam Weinig.
+
+ * ImageDiff/Makefile:
+ For any non-macOS SDK, build a macOS ImageDiff (because we use it on the host, not the target).
+
2021-07-29 Jonathan Bedard <[email protected]>
[webkitscmpy] Return remote objects from remote() function
Modified: trunk/Tools/ImageDiff/Makefile (280452 => 280453)
--- trunk/Tools/ImageDiff/Makefile 2021-07-29 22:26:13 UTC (rev 280452)
+++ trunk/Tools/ImageDiff/Makefile 2021-07-29 22:52:27 UTC (rev 280453)
@@ -2,17 +2,10 @@
TO_LOWER = $(shell echo $(1) | tr [:upper:] [:lower:])
-ifneq (,$(findstring iphone,$(call TO_LOWER,$(notdir $(SDKROOT)))))
+# For non-macOS SDKs, build a macOS version of ImageDiff.
+ifeq (,$(findstring macos,$(call TO_LOWER,$(notdir $(SDKROOT)))))
OVERRIDE_SDKROOT = default
OVERRIDE_ARCHS = default
endif
-ifneq (,$(findstring watch,$(call TO_LOWER,$(notdir $(SDKROOT)))))
- OVERRIDE_SDKROOT = default
- OVERRIDE_ARCHS = default
-endif
-ifneq (,$(findstring tv,$(call TO_LOWER,$(notdir $(SDKROOT)))))
- OVERRIDE_SDKROOT = default
- OVERRIDE_ARCHS = default
-endif
include ../../Makefile.shared
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
