Changeset 244692 in webkit


Ignore:
Timestamp:
Apr 26, 2019 9:47:35 AM (5 years ago)
Author:
achristensen@apple.com
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.

Location:
trunk/Source
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r244691 r244692  
     12019-04-26  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fix an internal High Sierra build after r244653
     4       ​https://bugs.webkit.org/show_bug.cgi?id=197131
     5
     6        * DerivedSources.make:
     7        Apparently we can't use gnu++17 when preprocessing Platform.h in the makefile.
     8
    192019-04-26  Chris Fleizach  <cfleizach@apple.com>
    210

  • trunk/Source/WebCore/DerivedSources.make

    r244653 r244692  
    11161116endif
    11171117
    1118 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)
     1118ifeq ($(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)
    11191119    WTF_PLATFORM_IOS_FAMILY = 1
    11201120else
    … …  
    11221122endif
    11231123
    1124 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)
     1124ifeq ($(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)
    11251125    WTF_PLATFORM_MAC = 1
    11261126else
    … …  
    11281128endif
    11291129
    1130 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)
     1130ifeq ($(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)
    11311131    USE_APPLE_INTERNAL_SDK = 1
    11321132else
    … …  
    11341134endif
    11351135
    1136 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)
     1136ifeq ($(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)
    11371137    HAVE_OS_DARK_MODE_SUPPORT = 1
    11381138else
    … …  
    11401140endif
    11411141
    1142 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)
     1142ifeq ($(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)
    11431143    ENABLE_ORIENTATION_EVENTS = 1
    11441144endif
    11451145
    1146 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)
     1146ifeq ($(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)
    11471147        ENABLE_MEDIA_SOURCE = 1
    11481148endif

  • trunk/Source/WebKit/ChangeLog

    r244687 r244692  
     12019-04-26  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fix an internal High Sierra build after r244653
     4       ​https://bugs.webkit.org/show_bug.cgi?id=197131
     5
     6        * DerivedSources.make:
     7        Apparently we can't use gnu++17 when preprocessing Platform.h in the makefile.
     8
    192019-04-26  Sihui Liu  <sihui_liu@apple.com>
    210

  • trunk/Source/WebKit/DerivedSources.make

    r244653 r244692  
    270270
    271271ifeq ($(OS),MACOS)
    272 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)
     272ifeq ($(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)
    273273        AUTOMATION_BACKEND_PLATFORM_ARGUMENTS = --platform iOS
    274274else
Note: See TracChangeset for help on using the changeset viewer.