diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch index 4a1a975f..3b24e064 100644 --- a/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From a0b1a742813d0846472fab4aada2388bf2d42d80 Mon Sep 17 00:00:00 2001 +From 5616656eb6d7423aaea107513209dac88c79d916 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Wed, 15 Mar 2017 13:53:28 +0200 Subject: [PATCH] chromium: Force host toolchain configuration @@ -10,16 +10,16 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- - chromium/tools/gn/bootstrap/bootstrap.py | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) + chromium/tools/gn/bootstrap/bootstrap.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py -index 43d252b43e..e58347848e 100755 +index b1ff7e7..bccabbb 100755 --- a/chromium/tools/gn/bootstrap/bootstrap.py +++ b/chromium/tools/gn/bootstrap/bootstrap.py -@@ -298,14 +298,14 @@ def write_gn_ninja(path, root_gen_dir, options): - ld = os.environ.get('LD', 'link.exe') - ar = os.environ.get('AR', 'lib.exe') +@@ -318,10 +318,10 @@ def write_gn_ninja(path, root_gen_dir, options): + ld = os.environ.get('LD', cxx) + ar = os.environ.get('AR', 'ar -X64') else: - cc = os.environ.get('CC', 'cc') - cxx = os.environ.get('CXX', 'c++') @@ -29,12 +29,5 @@ index 43d252b43e..e58347848e 100755 - ar = os.environ.get('AR', 'ar') + ar = os.environ.get('AR_host', 'ar') -- cflags = os.environ.get('CFLAGS', '').split() -- cflags_cc = os.environ.get('CXXFLAGS', '').split() -- ldflags = os.environ.get('LDFLAGS', '').split() -+ cflags = os.environ.get('CFLAGS_host', '').split() -+ cflags_cc = os.environ.get('CXXFLAGS_host', '').split() -+ ldflags = os.environ.get('LDFLAGS_host', '').split() - include_dirs = [root_gen_dir, SRC_ROOT] - libs = [] - + # QTBUG-64759 + # cflags = os.environ.get('CFLAGS', '').split() |