Diff
Modified: trunk/ChangeLog (271036 => 271037)
--- trunk/ChangeLog 2020-12-21 20:17:09 UTC (rev 271036)
+++ trunk/ChangeLog 2020-12-21 20:46:10 UTC (rev 271037)
@@ -1,3 +1,15 @@
+2020-12-21 Ryan Hostetler <[email protected]>
+
+ $(findstring iphone,$(SDKROOT)) fails when SDKROOT is not lowercase
+ https://bugs.webkit.org/show_bug.cgi?id=219993
+ rdar://72436093
+
+ Reviewed by Darin Adler.
+
+ Update SDKROOT evaluation to be lowercase and SDK filename only.
+
+ * Source/Makefile:
+
2020-12-16 Fujii Hironori <[email protected]>
[WinCairo] Enable USE_ANGLE
Modified: trunk/Source/Makefile (271036 => 271037)
--- trunk/Source/Makefile 2020-12-21 20:17:09 UTC (rev 271036)
+++ trunk/Source/Makefile 2020-12-21 20:46:10 UTC (rev 271037)
@@ -1,7 +1,9 @@
WEBINSPECTORUI_MODULE =
+TO_LOWER = $(shell echo $(1) | tr [:upper:] [:lower:])
+
ifneq (,$(SDKROOT))
- ifneq (,$(findstring macosx,$(SDKROOT)))
+ ifneq (,$(findstring macosx,$(call TO_LOWER,$(notdir $(SDKROOT)))))
WEBINSPECTORUI_MODULE = WebInspectorUI
endif
else
Modified: trunk/Source/ThirdParty/ChangeLog (271036 => 271037)
--- trunk/Source/ThirdParty/ChangeLog 2020-12-21 20:17:09 UTC (rev 271036)
+++ trunk/Source/ThirdParty/ChangeLog 2020-12-21 20:46:10 UTC (rev 271037)
@@ -1,3 +1,15 @@
+2020-12-21 Ryan Hostetler <[email protected]>
+
+ $(findstring iphone,$(SDKROOT)) fails when SDKROOT is not lowercase
+ https://bugs.webkit.org/show_bug.cgi?id=219993
+ rdar://72436093
+
+ Reviewed by Darin Adler.
+
+ Update SDKROOT evaluation to be lowercase and SDK filename only.
+
+ * Makefile:
+
2020-12-04 Adam Roben <[email protected]>
More FALLBACK_PLATFORM adoption
Modified: trunk/Source/ThirdParty/Makefile (271036 => 271037)
--- trunk/Source/ThirdParty/Makefile 2020-12-21 20:17:09 UTC (rev 271036)
+++ trunk/Source/ThirdParty/Makefile 2020-12-21 20:46:10 UTC (rev 271037)
@@ -1,17 +1,19 @@
LIBWEBRTC_MODULE =
+TO_LOWER = $(shell echo $(1) | tr [:upper:] [:lower:])
+
ifeq (iosmac,$(SDK_VARIANT))
DISABLE_LIBWEBRTC = 1
endif
ifneq (,$(SDKROOT))
- ifneq (,$(findstring iphone,$(SDKROOT)))
+ ifneq (,$(findstring iphone,$(call TO_LOWER,$(notdir $(SDKROOT)))))
LIBWEBRTC_MODULE = libwebrtc
endif
- ifneq (,$(findstring macosx,$(SDKROOT)))
+ ifneq (,$(findstring macosx,$(call TO_LOWER,$(notdir $(SDKROOT)))))
LIBWEBRTC_MODULE = libwebrtc
endif
- ifneq (,$(findstring watch,$(SDKROOT)))
+ ifneq (,$(findstring watch,$(call TO_LOWER,$(notdir $(SDKROOT)))))
LIBWEBRTC_MODULE = libwebrtc
endif
else
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (271036 => 271037)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-12-21 20:17:09 UTC (rev 271036)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-12-21 20:46:10 UTC (rev 271037)
@@ -1,3 +1,15 @@
+2020-12-21 Ryan Hostetler <[email protected]>
+
+ $(findstring iphone,$(SDKROOT)) fails when SDKROOT is not lowercase
+ https://bugs.webkit.org/show_bug.cgi?id=219993
+ rdar://72436093
+
+ Reviewed by Darin Adler.
+
+ Update SDKROOT evaluation to be lowercase and SDK filename only.
+
+ * Makefile:
+
2020-12-16 Youenn Fablet <[email protected]>
Cherry-pick usrsctp 355fb576b1a9dfef70fc0e158d66692662baaddc
Modified: trunk/Source/ThirdParty/libwebrtc/Makefile (271036 => 271037)
--- trunk/Source/ThirdParty/libwebrtc/Makefile 2020-12-21 20:17:09 UTC (rev 271036)
+++ trunk/Source/ThirdParty/libwebrtc/Makefile 2020-12-21 20:46:10 UTC (rev 271037)
@@ -1,5 +1,7 @@
+TO_LOWER = $(shell echo $(1) | tr [:upper:] [:lower:])
+
ifneq (,$(SDKROOT))
- ifneq (,$(findstring watch,$(SDKROOT)))
+ ifneq (,$(findstring watch,$(call TO_LOWER,$(notdir $(SDKROOT)))))
OTHER_OPTIONS += -target boringssl
endif
endif
Modified: trunk/Tools/ChangeLog (271036 => 271037)
--- trunk/Tools/ChangeLog 2020-12-21 20:17:09 UTC (rev 271036)
+++ trunk/Tools/ChangeLog 2020-12-21 20:46:10 UTC (rev 271037)
@@ -1,3 +1,16 @@
+2020-12-21 Ryan Hostetler <[email protected]>
+
+ $(findstring iphone,$(SDKROOT)) fails when SDKROOT is not lowercase
+ https://bugs.webkit.org/show_bug.cgi?id=219993
+ rdar://72436093
+
+ Reviewed by Darin Adler.
+
+ Update SDKROOT evaluation to be lowercase and SDK filename only.
+
+ * ImageDiff/Makefile:
+ * Makefile:
+
2020-12-21 Fujii Hironori <[email protected]>
[Win][MiniBrowser] Update built-in User-Agent strings (December 2020)
Modified: trunk/Tools/ImageDiff/Makefile (271036 => 271037)
--- trunk/Tools/ImageDiff/Makefile 2020-12-21 20:17:09 UTC (rev 271036)
+++ trunk/Tools/ImageDiff/Makefile 2020-12-21 20:46:10 UTC (rev 271037)
@@ -1,14 +1,16 @@
SCRIPTS_PATH = ../Scripts
-ifneq (,$(findstring iphone,$(SDKROOT)))
+TO_LOWER = $(shell echo $(1) | tr [:upper:] [:lower:])
+
+ifneq (,$(findstring iphone,$(call TO_LOWER,$(notdir $(SDKROOT)))))
OVERRIDE_SDKROOT = default
OVERRIDE_ARCHS = default
endif
-ifneq (,$(findstring watch,$(SDKROOT)))
+ifneq (,$(findstring watch,$(call TO_LOWER,$(notdir $(SDKROOT)))))
OVERRIDE_SDKROOT = default
OVERRIDE_ARCHS = default
endif
-ifneq (,$(findstring tv,$(SDKROOT)))
+ifneq (,$(findstring tv,$(call TO_LOWER,$(notdir $(SDKROOT)))))
OVERRIDE_SDKROOT = default
OVERRIDE_ARCHS = default
endif
Modified: trunk/Tools/Makefile (271036 => 271037)
--- trunk/Tools/Makefile 2020-12-21 20:17:09 UTC (rev 271036)
+++ trunk/Tools/Makefile 2020-12-21 20:46:10 UTC (rev 271037)
@@ -1,14 +1,16 @@
MODULES = DumpRenderTree WebKitTestRunner MiniBrowser ../Source/ThirdParty/gtest/xcode TestWebKitAPI
+TO_LOWER = $(shell echo $(1) | tr [:upper:] [:lower:])
+
ifneq (,$(SDKROOT))
- ifeq (,$(findstring macosx,$(SDKROOT)))
+ ifeq (,$(findstring macosx,$(call TO_LOWER,$(notdir $(SDKROOT)))))
# Embedded OS
MODULES = DumpRenderTree WebKitTestRunner ../Source/ThirdParty/gtest/xcode TestWebKitAPI
endif
- ifneq (,$(findstring macosx,$(SDKROOT)))
+ ifneq (,$(findstring macosx,$(call TO_LOWER,$(notdir $(SDKROOT)))))
MODULES += lldb/lldbWebKitTester
endif
- ifneq (,$(findstring iphone,$(SDKROOT)))
+ ifneq (,$(findstring iphone,$(call TO_LOWER,$(notdir $(SDKROOT)))))
MODULES += MobileMiniBrowser
endif
endif