Title: [255163] trunk/Tools
Revision
255163
Author
[email protected]
Date
2020-01-27 13:14:01 -0800 (Mon, 27 Jan 2020)

Log Message

Fix internal builds
https://bugs.webkit.org/show_bug.cgi?id=206790
<rdar://problem/58888951>

Reviewed by Maciej Stachowiak.

TestRunner.cpp in DumpRenderTree includes ExecutableAllocator.h. In
some circumstances, this file can include <os/thread_self_restrict.h>,
which in turn includes <machine/cpu_capabilities.h>. This latter file
does not exist at a standard location, and the build fails due to not
being able to find the file. Fix this by adding a path to it to the
build command line.

* DumpRenderTree/mac/Configurations/Base.xcconfig:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (255162 => 255163)


--- trunk/Tools/ChangeLog	2020-01-27 20:54:54 UTC (rev 255162)
+++ trunk/Tools/ChangeLog	2020-01-27 21:14:01 UTC (rev 255163)
@@ -1,3 +1,20 @@
+2020-01-27  Keith Rollin  <[email protected]>
+
+        Fix internal builds
+        https://bugs.webkit.org/show_bug.cgi?id=206790
+        <rdar://problem/58888951>
+
+        Reviewed by Maciej Stachowiak.
+
+        TestRunner.cpp in DumpRenderTree includes ExecutableAllocator.h. In
+        some circumstances, this file can include <os/thread_self_restrict.h>,
+        which in turn includes <machine/cpu_capabilities.h>. This latter file
+        does not exist at a standard location, and the build fails due to not
+        being able to find the file. Fix this by adding a path to it to the
+        build command line.
+
+        * DumpRenderTree/mac/Configurations/Base.xcconfig:
+
 2020-01-27  Robin Morisset  <[email protected]>
 
         Tools/Scripts/set-webkit-configuration should accept --coverage/--no-coverage

Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (255162 => 255163)


--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig	2020-01-27 20:54:54 UTC (rev 255162)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig	2020-01-27 21:14:01 UTC (rev 255163)
@@ -107,8 +107,8 @@
 
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
 
 WEBKIT_FRAMEWORK_RESOURCES_PATH = WebKit.framework;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to