Attachment 369021 Details for Bug 197583 – Patch

[patch] Patch

197583.diff (text/plain), 2.14 KB, created by Christopher Reid on 2019-05-03 16:45:46 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Christopher Reid

Created: 2019-05-03 16:45:46 PDT

Size: 2.14 KB

patch

obsolete

>diff --git a/ChangeLog b/ChangeLog
>index 4921060bf4a..9948678ae16 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-05-03  Christopher Reid  <chris.reid@sony.com>
>+
>+        [CMake] fuse-ld should also be set in module linker flags
>+        https://bugs.webkit.org/show_bug.cgi?id=197583
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add fuse-ld to CMAKE_MODULE_LINKER_FLAGS.
>+
>+        * Source/cmake/OptionsCommon.cmake:
>+
> 2019-05-03  Basuke Suzuki  <Basuke.Suzuki@sony.com>
> 
>         [WinCairo] Implement and enable RemoteInspector Server.
>diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
>index 89efab5b4cc..ed83da7cb96 100644
>--- a/Source/cmake/OptionsCommon.cmake
>+++ b/Source/cmake/OptionsCommon.cmake
>@@ -66,7 +66,8 @@ if (USE_LD_LLD)
>     execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=lld -Wl,--version ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
>     if ("${LD_VERSION}" MATCHES "LLD")
>         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld -Wl,--disable-new-dtags")
>-        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld -Wl,--disable-new-dtags")
>+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld -Wl,--disable-new-dtags")
>+        set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=lld -Wl,--disable-new-dtags")
>     else ()
>         set(USE_LD_LLD OFF)
>     endif ()
>@@ -79,7 +80,8 @@ if (USE_LD_GOLD)
>     execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
>     if ("${LD_VERSION}" MATCHES "GNU gold")
>         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold -Wl,--disable-new-dtags")
>-        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold -Wl,--disable-new-dtags")
>+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=gold -Wl,--disable-new-dtags")
>+        set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=gold -Wl,--disable-new-dtags")
>     else ()
>         message(WARNING "GNU gold linker isn't available, using the default system linker.")
>         set(USE_LD_GOLD OFF)

Actions: View | Formatted Diff | Diff

Attachments on bug 197583: 369021 | 369062 | 369108