Title: [244692] trunk/Source
- Revision
- 244692
- Author
- [email protected]
- Date
- 2019-04-26 09:47:35 -0700 (Fri, 26 Apr 2019)
Log Message
Fix an internal High Sierra build after r244653
https://bugs.webkit.org/show_bug.cgi?id=197131
* DerivedSources.make:
Apparently we can't use gnu++17 when preprocessing Platform.h in the makefile.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (244691 => 244692)
--- trunk/Source/WebCore/ChangeLog 2019-04-26 16:36:29 UTC (rev 244691)
+++ trunk/Source/WebCore/ChangeLog 2019-04-26 16:47:35 UTC (rev 244692)
@@ -1,3 +1,11 @@
+2019-04-26 Alex Christensen <[email protected]>
+
+ Fix an internal High Sierra build after r244653
+ https://bugs.webkit.org/show_bug.cgi?id=197131
+
+ * DerivedSources.make:
+ Apparently we can't use gnu++17 when preprocessing Platform.h in the makefile.
+
2019-04-26 Chris Fleizach <[email protected]>
AX: Provide iOS method for setting focus
Modified: trunk/Source/WebCore/DerivedSources.make (244691 => 244692)
--- trunk/Source/WebCore/DerivedSources.make 2019-04-26 16:36:29 UTC (rev 244691)
+++ trunk/Source/WebCore/DerivedSources.make 2019-04-26 16:47:35 UTC (rev 244692)
@@ -1115,35 +1115,35 @@
TARGET_TRIPLE_FLAGS=-target $(WK_CURRENT_ARCH)-$(LLVM_TARGET_TRIPLE_VENDOR)-$(LLVM_TARGET_TRIPLE_OS_VERSION)$(LLVM_TARGET_TRIPLE_SUFFIX)
endif
-ifeq ($(shell $(CC) -std=gnu++17 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_IOS_FAMILY ' | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++14 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_IOS_FAMILY ' | cut -d' ' -f3), 1)
WTF_PLATFORM_IOS_FAMILY = 1
else
WTF_PLATFORM_IOS_FAMILY = 0
endif
-ifeq ($(shell $(CC) -std=gnu++17 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_MAC ' | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++14 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_MAC ' | cut -d' ' -f3), 1)
WTF_PLATFORM_MAC = 1
else
WTF_PLATFORM_MAC = 0
endif
-ifeq ($(shell $(CC) -std=gnu++17 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep USE_APPLE_INTERNAL_SDK | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++14 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep USE_APPLE_INTERNAL_SDK | cut -d' ' -f3), 1)
USE_APPLE_INTERNAL_SDK = 1
else
USE_APPLE_INTERNAL_SDK = 0
endif
-ifeq ($(shell $(CC) -std=gnu++17 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep HAVE_OS_DARK_MODE_SUPPORT | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++14 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep HAVE_OS_DARK_MODE_SUPPORT | cut -d' ' -f3), 1)
HAVE_OS_DARK_MODE_SUPPORT = 1
else
HAVE_OS_DARK_MODE_SUPPORT = 0
endif
-ifeq ($(shell $(CC) -std=gnu++17 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_ORIENTATION_EVENTS | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++14 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_ORIENTATION_EVENTS | cut -d' ' -f3), 1)
ENABLE_ORIENTATION_EVENTS = 1
endif
-ifeq ($(shell $(CC) -std=gnu++17 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_MEDIA_SOURCE | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++14 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_MEDIA_SOURCE | cut -d' ' -f3), 1)
ENABLE_MEDIA_SOURCE = 1
endif
Modified: trunk/Source/WebKit/ChangeLog (244691 => 244692)
--- trunk/Source/WebKit/ChangeLog 2019-04-26 16:36:29 UTC (rev 244691)
+++ trunk/Source/WebKit/ChangeLog 2019-04-26 16:47:35 UTC (rev 244692)
@@ -1,3 +1,11 @@
+2019-04-26 Alex Christensen <[email protected]>
+
+ Fix an internal High Sierra build after r244653
+ https://bugs.webkit.org/show_bug.cgi?id=197131
+
+ * DerivedSources.make:
+ Apparently we can't use gnu++17 when preprocessing Platform.h in the makefile.
+
2019-04-26 Sihui Liu <[email protected]>
Stop IDB transactions to release locked database files when network process is ready to suspend
Modified: trunk/Source/WebKit/DerivedSources.make (244691 => 244692)
--- trunk/Source/WebKit/DerivedSources.make 2019-04-26 16:36:29 UTC (rev 244691)
+++ trunk/Source/WebKit/DerivedSources.make 2019-04-26 16:47:35 UTC (rev 244692)
@@ -269,7 +269,7 @@
AUTOMATION_PROTOCOL_OUTPUT_PATTERNS = $(subst .,%,$(AUTOMATION_PROTOCOL_OUTPUT_FILES))
ifeq ($(OS),MACOS)
-ifeq ($(shell $(CC) -std=gnu++17 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_IOS_FAMILY ' | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -std=gnu++14 -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_IOS_FAMILY ' | cut -d' ' -f3), 1)
AUTOMATION_BACKEND_PLATFORM_ARGUMENTS = --platform iOS
else
AUTOMATION_BACKEND_PLATFORM_ARGUMENTS = --platform macOS
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
