Title: [228144] trunk
Revision
228144
Author
[email protected]
Date
2018-02-05 17:21:51 -0800 (Mon, 05 Feb 2018)

Log Message

Unreviewed, fix build using the new ENABLE_ADDRESS_SANITIZER option
https://bugs.webkit.org/show_bug.cgi?id=182400
<rdar://problem/37252242>

I failed to properly test a last-minute change.

* Source/cmake/WebKitCompilerFlags.cmake:

Modified Paths

Diff

Modified: trunk/ChangeLog (228143 => 228144)


--- trunk/ChangeLog	2018-02-06 00:49:22 UTC (rev 228143)
+++ trunk/ChangeLog	2018-02-06 01:21:51 UTC (rev 228144)
@@ -1,5 +1,15 @@
 2018-02-05  Michael Catanzaro  <[email protected]>
 
+        Unreviewed, fix build using the new ENABLE_ADDRESS_SANITIZER option
+        https://bugs.webkit.org/show_bug.cgi?id=182400
+        <rdar://problem/37252242>
+
+        I failed to properly test a last-minute change.
+
+        * Source/cmake/WebKitCompilerFlags.cmake:
+
+2018-02-05  Michael Catanzaro  <[email protected]>
+
         [CMake] Add ENABLE_ADDRESS_SANITIZER to make it easier to build with asan support
         https://bugs.webkit.org/show_bug.cgi?id=182400
 

Modified: trunk/Source/cmake/WebKitCompilerFlags.cmake (228143 => 228144)


--- trunk/Source/cmake/WebKitCompilerFlags.cmake	2018-02-06 00:49:22 UTC (rev 228143)
+++ trunk/Source/cmake/WebKitCompilerFlags.cmake	2018-02-06 01:21:51 UTC (rev 228144)
@@ -166,8 +166,8 @@
                                              -fno-optimize-sibling-calls)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_THREAD_LIBS_INIT} ${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
-        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_THREAD_LIBS_INIT} ${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address")
+        set(CMAKE_EXE_LINKER_FLAGS "-pthread ${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
+        set(CMAKE_SHARED_LINKER_FLAGS "-pthread ${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address")
     endif ()
 endif ()
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to