From b145ab4273c59f4f908cdaff9e267241bd970e93 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 3 Feb 2020 17:06:27 -0800 Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG Fixes build failures on risv64 Taken from https://trac.webkit.org/changeset/231843/webkit Enable THREADS_PREFER_PTHREAD_FLAG. This uses -pthread instead of -lpthread, fixing the 64-bit RISC-V build of the GTK+ port due to missing atomic primitives. Upstream-Status: Submitted [https://trac.webkit.org/changeset/231843/webkit] Signed-off-by: Khem Raj --- Source/cmake/OptionsGTK.cmake | 1 + Source/cmake/OptionsJSCOnly.cmake | 1 + 2 files changed, 2 insertions(+) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake index 8732e935..9b4fbae7 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -32,6 +32,7 @@ set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") if (USER_AGENT_BRANDING) add_definitions(-DUSER_AGENT_BRANDING="${USER_AGENT_BRANDING}") endif () +set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Cairo 1.14.0 REQUIRED) find_package(Fontconfig 2.8.0 REQUIRED) diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake index 316c6240..2f712602 100644 --- a/Source/cmake/OptionsJSCOnly.cmake +++ b/Source/cmake/OptionsJSCOnly.cmake @@ -1,3 +1,4 @@ +set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) if (MSVC)