<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[286018] trunk/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/286018">286018</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2021-11-18 11:30:52 -0800 (Thu, 18 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add missing dependencies for <wtf/Platform.h> when generating derived sources
<https://webkit.org/b/233304>
<rdar://problem/85533245>

Reviewed by Darin Adler.

Source/JavaScriptCore:

* JavaScriptCore.xcodeproj/project.pbxproj:
(Derived Sources : Generate Derived Sources):
- Add an input dependency on the script run from the build phase
  script.

* DerivedSources-input.xcfilelist:
- Update after changes to DerivedSoures.make.  WebKit headers
  included by <wtf/Platform.h> are now listed.
* DerivedSources.make:
(platform_h_compiler_command): Add.
(FEATURE_AND_PLATFORM_DEFINES):
- Extract compiler command into a call routine for reuse.
(PLATFORM_HEADER_DIR): Add.
(PLATFORM_HEADER_DEPENDENCIES): Add.
(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES):
- Generate a makefile dependency list for <wtf/Platform.h>, then
  filter it to list only WebKit project headers.

Source/WebCore:

* WebCore.xcodeproj/project.pbxproj:
(Derived Sources : Generate Derived Sources):
- Add an input dependency on the script run from the build phase
  script.

* DerivedSources-input.xcfilelist:
- Update after changes to DerivedSoures.make.  WebKit headers
  included by <wtf/Platform.h> are now listed.
* DerivedSources.make:
(platform_h_compiler_command): Add.
(FEATURE_AND_PLATFORM_DEFINES):
- Extract compiler command into a call routine for reuse.
(PLATFORM_HEADER_DIR): Add.
(PLATFORM_HEADER_DEPENDENCIES): Add.
(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES):
- Generate a makefile dependency list for <wtf/Platform.h>, then
  filter it to list only WebKit project headers.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreDerivedSourcesinputxcfilelist">trunk/Source/JavaScriptCore/DerivedSources-input.xcfilelist</a></li>
<li><a href="#trunkSourceJavaScriptCoreDerivedSourcesmake">trunk/Source/JavaScriptCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesinputxcfilelist">trunk/Source/WebCore/DerivedSources-input.xcfilelist</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (286017 => 286018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2021-11-18 19:19:20 UTC (rev 286017)
+++ trunk/Source/JavaScriptCore/ChangeLog       2021-11-18 19:30:52 UTC (rev 286018)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2021-11-18  David Kilzer  <ddkilzer@apple.com>
+
+        Add missing dependencies for <wtf/Platform.h> when generating derived sources
+        <https://webkit.org/b/233304>
+        <rdar://problem/85533245>
+
+        Reviewed by Darin Adler.
+
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        (Derived Sources : Generate Derived Sources):
+        - Add an input dependency on the script run from the build phase
+          script.
+
+        * DerivedSources-input.xcfilelist:
+        - Update after changes to DerivedSoures.make.  WebKit headers
+          included by <wtf/Platform.h> are now listed.
+        * DerivedSources.make:
+        (platform_h_compiler_command): Add.
+        (FEATURE_AND_PLATFORM_DEFINES):
+        - Extract compiler command into a call routine for reuse.
+        (PLATFORM_HEADER_DIR): Add.
+        (PLATFORM_HEADER_DEPENDENCIES): Add.
+        (FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES):
+        - Generate a makefile dependency list for <wtf/Platform.h>, then
+          filter it to list only WebKit project headers.
+
</ins><span class="cx"> 2021-11-18  Carlos Garcia Campos  <cgarcia@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GLIB] jsc_value_object_define_property_accessor() throws an exception when called on a value without a wrapper instance
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreDerivedSourcesinputxcfilelist"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/DerivedSources-input.xcfilelist (286017 => 286018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/DerivedSources-input.xcfilelist      2021-11-18 19:19:20 UTC (rev 286017)
+++ trunk/Source/JavaScriptCore/DerivedSources-input.xcfilelist 2021-11-18 19:30:52 UTC (rev 286018)
</span><span class="lines">@@ -1,4 +1,18 @@
</span><span class="cx"> # This file is generated by the generate-xcfilelists script.
</span><ins>+$(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/AdditionalFeatureDefines.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/AdditionalPlatform.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/bmalloc/BCompiler.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/bmalloc/BPlatform.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Compiler.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Platform.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformCPU.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformCallingConventions.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformEnable.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformEnableCocoa.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformHave.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformLegacy.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformOS.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformUse.h
</ins><span class="cx"> $(PROJECT_DIR)/DerivedSources.make
</span><span class="cx"> $(PROJECT_DIR)/KeywordLookupGenerator.py
</span><span class="cx"> $(PROJECT_DIR)/Scripts/UpdateContents.py
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/DerivedSources.make (286017 => 286018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/DerivedSources.make  2021-11-18 19:19:20 UTC (rev 286017)
+++ trunk/Source/JavaScriptCore/DerivedSources.make     2021-11-18 19:30:52 UTC (rev 286018)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# Copyright (C) 2006-2020 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2006-2021 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions
</span><span class="lines">@@ -43,11 +43,15 @@
</span><span class="cx"> 
</span><span class="cx"> FRAMEWORK_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | $(PERL) -e 'print "-F " . join(" -F ", split(" ", <>));')
</span><span class="cx"> HEADER_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | $(PERL) -e 'print "-I" . join(" -I", split(" ", <>));')
</span><del>-FEATURE_AND_PLATFORM_DEFINES := $(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | $(PERL) -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
</del><span class="cx"> 
</span><del>-# FIXME: This should list Platform.h and all the things it includes. Could do that by using the -MD flag in the CC line above.
-FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES = DerivedSources.make
</del><ins>+platform_h_compiler_command = $(CC) -std=gnu++1z -x c++ $(1) $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null
</ins><span class="cx"> 
</span><ins>+FEATURE_AND_PLATFORM_DEFINES := $(shell $(call platform_h_compiler_command,-E -P -dM) | $(PERL) -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
+
+PLATFORM_HEADER_DIR := $(realpath $(BUILT_PRODUCTS_DIR)/usr/local/include)
+PLATFORM_HEADER_DEPENDENCIES := $(filter $(PLATFORM_HEADER_DIR)/%,$(realpath $(shell $(call platform_h_compiler_command,-M) | $(PERL) -e "local \$$/; my (\$$target, \$$deps) = split(/:/, <>); print split(/\\\\/, \$$deps);")))
+FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES = DerivedSources.make $(PLATFORM_HEADER_DEPENDENCIES)
+
</ins><span class="cx"> # --------
</span><span class="cx"> 
</span><span class="cx"> VPATH = \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (286017 => 286018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj     2021-11-18 19:19:20 UTC (rev 286017)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj        2021-11-18 19:30:52 UTC (rev 286018)
</span><span class="lines">@@ -11670,6 +11670,7 @@
</span><span class="cx">                          "$(SRCROOT)/DerivedSources-input.xcfilelist",
</span><span class="cx">                  );
</span><span class="cx">                  inputPaths = (
</span><ins>+                               "$(SRCROOT)/Scripts/generate-derived-sources.sh",
</ins><span class="cx">                   );
</span><span class="cx">                  name = "Generate Derived Sources";
</span><span class="cx">                  outputFileListPaths = (
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (286017 => 286018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-11-18 19:19:20 UTC (rev 286017)
+++ trunk/Source/WebCore/ChangeLog      2021-11-18 19:30:52 UTC (rev 286018)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2021-11-18  David Kilzer  <ddkilzer@apple.com>
+
+        Add missing dependencies for <wtf/Platform.h> when generating derived sources
+        <https://webkit.org/b/233304>
+        <rdar://problem/85533245>
+
+        Reviewed by Darin Adler.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        (Derived Sources : Generate Derived Sources):
+        - Add an input dependency on the script run from the build phase
+          script.
+
+        * DerivedSources-input.xcfilelist:
+        - Update after changes to DerivedSoures.make.  WebKit headers
+          included by <wtf/Platform.h> are now listed.
+        * DerivedSources.make:
+        (platform_h_compiler_command): Add.
+        (FEATURE_AND_PLATFORM_DEFINES):
+        - Extract compiler command into a call routine for reuse.
+        (PLATFORM_HEADER_DIR): Add.
+        (PLATFORM_HEADER_DEPENDENCIES): Add.
+        (FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES):
+        - Generate a makefile dependency list for <wtf/Platform.h>, then
+          filter it to list only WebKit project headers.
+
</ins><span class="cx"> 2021-11-18  Christopher Reid  <c29reid@uwaterloo.ca>
</span><span class="cx"> 
</span><span class="cx">         [Win] Build fix after r285991
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesinputxcfilelist"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources-input.xcfilelist (286017 => 286018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources-input.xcfilelist     2021-11-18 19:19:20 UTC (rev 286017)
+++ trunk/Source/WebCore/DerivedSources-input.xcfilelist        2021-11-18 19:30:52 UTC (rev 286018)
</span><span class="lines">@@ -1,4 +1,17 @@
</span><span class="cx"> # This file is generated by the generate-xcfilelists script.
</span><ins>+$(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/AdditionalFeatureDefines.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/bmalloc/BCompiler.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/bmalloc/BPlatform.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Compiler.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Platform.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformCPU.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformCallingConventions.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformEnable.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformEnableCocoa.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformHave.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformLegacy.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformOS.h
+$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformUse.h
</ins><span class="cx"> $(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts/Preferences/WebPreferences.yaml
</span><span class="cx"> $(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts/Preferences/WebPreferencesDebug.yaml
</span><span class="cx"> $(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts/Preferences/WebPreferencesExperimental.yaml
</span><span class="lines">@@ -158,6 +171,7 @@
</span><span class="cx"> $(PROJECT_DIR)/Modules/WebGPU/GPUVertexStepMode.idl
</span><span class="cx"> $(PROJECT_DIR)/Modules/WebGPU/NavigatorGPU.idl
</span><span class="cx"> $(PROJECT_DIR)/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.idl
</span><ins>+$(PROJECT_DIR)/Modules/applepay-ams-ui/ApplePayAMSUIRequest.idl
</ins><span class="cx"> $(PROJECT_DIR)/Modules/applepay/ApplePayCancelEvent.idl
</span><span class="cx"> $(PROJECT_DIR)/Modules/applepay/ApplePayContactField.idl
</span><span class="cx"> $(PROJECT_DIR)/Modules/applepay/ApplePayCouponCodeChangedEvent.idl
</span><span class="lines">@@ -205,7 +219,6 @@
</span><span class="cx"> $(PROJECT_DIR)/Modules/applepay/ApplePayValidateMerchantEvent.idl
</span><span class="cx"> $(PROJECT_DIR)/Modules/applepay/paymentrequest/ApplePayModifier.idl
</span><span class="cx"> $(PROJECT_DIR)/Modules/applepay/paymentrequest/ApplePayRequest.idl
</span><del>-$(PROJECT_DIR)/Modules/applepay-ams-ui/ApplePayAMSUIRequest.idl
</del><span class="cx"> $(PROJECT_DIR)/Modules/async-clipboard/Clipboard.idl
</span><span class="cx"> $(PROJECT_DIR)/Modules/async-clipboard/ClipboardItem.idl
</span><span class="cx"> $(PROJECT_DIR)/Modules/async-clipboard/Navigator+Clipboard.idl
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (286017 => 286018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2021-11-18 19:19:20 UTC (rev 286017)
+++ trunk/Source/WebCore/DerivedSources.make    2021-11-18 19:30:52 UTC (rev 286018)
</span><span class="lines">@@ -45,11 +45,15 @@
</span><span class="cx"> 
</span><span class="cx"> FRAMEWORK_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | $(PERL) -e 'print "-F " . join(" -F ", split(" ", <>));')
</span><span class="cx"> HEADER_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | $(PERL) -e 'print "-I" . join(" -I", split(" ", <>));')
</span><del>-FEATURE_AND_PLATFORM_DEFINES := $(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | $(PERL) -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
</del><span class="cx"> 
</span><del>-# FIXME: This should list Platform.h and all the things it includes. Could do that by using the -MD flag in the CC line above.
-FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES = $(WebCore)/DerivedSources.make
</del><ins>+platform_h_compiler_command = $(CC) -std=gnu++1z -x c++ $(1) $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null
</ins><span class="cx"> 
</span><ins>+FEATURE_AND_PLATFORM_DEFINES := $(shell $(call platform_h_compiler_command,-E -P -dM) | $(PERL) -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
+
+PLATFORM_HEADER_DIR := $(realpath $(BUILT_PRODUCTS_DIR)/usr/local/include)
+PLATFORM_HEADER_DEPENDENCIES := $(filter $(PLATFORM_HEADER_DIR)/%,$(realpath $(shell $(call platform_h_compiler_command,-M) | $(PERL) -e "local \$$/; my (\$$target, \$$deps) = split(/:/, <>); print split(/\\\\/, \$$deps);")))
+FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES = $(WebCore)/DerivedSources.make $(PLATFORM_HEADER_DEPENDENCIES)
+
</ins><span class="cx"> # --------
</span><span class="cx"> 
</span><span class="cx"> JS_BINDING_IDLS := \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (286017 => 286018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj   2021-11-18 19:19:20 UTC (rev 286017)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj      2021-11-18 19:30:52 UTC (rev 286018)
</span><span class="lines">@@ -37413,6 +37413,7 @@
</span><span class="cx">                          "$(WK_WEBCORE_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS)",
</span><span class="cx">                  );
</span><span class="cx">                  inputPaths = (
</span><ins>+                               "$(SRCROOT)/Scripts/generate-derived-sources.sh",
</ins><span class="cx">                   );
</span><span class="cx">                  name = "Generate Derived Sources";
</span><span class="cx">                  outputFileListPaths = (
</span></span></pre>
</div>
</div>

</body>
</html>