From fd86202d56c542011d24dc518457631bc00901c9 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 22 Nov 2019 15:52:52 +0200 Subject: qtwebengine: add clang fix Incorrectly removed previously, added back after rebasing it and the next patch touching the same file. Change-Id: I6f588b92e9356eec48f8dab88eee65cf84cce3c2 Reviewed-by: Qt CI Bot Reviewed-by: Mikko Gronoff --- ...hromium-Do-not-try-to-set-the-guessed-values-for-ma.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch') diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch index 5f7901e8..61d01fef 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch @@ -1,4 +1,4 @@ -From f49c5d488951027f1577f79681d448c3f30f6ae3 Mon Sep 17 00:00:00 2001 +From e7fa0c8b3c0a0a2d80180b032b1c73593e496f82 Mon Sep 17 00:00:00 2001 From: Johannes Pointner Date: Fri, 3 May 2019 09:12:38 +0200 Subject: [PATCH] chromium: Do not try to set the guessed values for @@ -17,12 +17,12 @@ Signed-off-by: Johannes Pointner 1 file changed, 9 deletions(-) diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn -index 127d0c444bd..b653e933d6f 100644 +index 7179df05451..884c9714bbb 100644 --- a/chromium/build/config/compiler/BUILD.gn +++ b/chromium/build/config/compiler/BUILD.gn -@@ -749,15 +749,6 @@ config("compiler_cpu_abi") { - cflags += [ "--target=arm-linux-gnueabihf" ] - ldflags += [ "--target=arm-linux-gnueabihf" ] +@@ -774,15 +774,6 @@ config("compiler_cpu_abi") { + } else if (current_cpu == "arm") { + if (is_clang && !is_android && !is_nacl) { } - if (!is_nacl) { - cflags += [ @@ -35,4 +35,4 @@ index 127d0c444bd..b653e933d6f 100644 - } } else if (current_cpu == "arm64") { if (is_clang && !is_android && !is_nacl && !is_fuchsia) { - cflags += [ "--target=aarch64-linux-gnu" ] + } -- cgit v1.2.3-54-g00ecf