Changeset 228631 in webkit

Timestamp:

Feb 19, 2018, 1:39:13 AM (9 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r228144 - 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:

Location:

releases/WebKitGTK/webkit-2.20

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/WebKitCompilerFlags.cmake (modified) (1 diff)

releases/WebKitGTK/webkit-2.20/ChangeLog

@@ +1 @@
+2018-02-05  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        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  <mcatanzaro@igalia.com>
 

releases/WebKitGTK/webkit-2.20/Source/cmake/WebKitCompilerFlags.cmake

@@ -167 +167 @@
         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 ()