1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
From 0d33ce775fdd1ee1befe2016ea3f6860d4c6e389 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
Force gcc/g++ to be used for parts using host toolchain, since
the option(host_build) does not work in yocto builds.
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 | 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 b1ff7e7..bccabbb 100755
--- a/chromium/tools/gn/bootstrap/bootstrap.py
+++ b/chromium/tools/gn/bootstrap/bootstrap.py
@@ -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++')
+ cc = os.environ.get('CC_host', 'gcc')
+ cxx = os.environ.get('CXX_host', 'g++')
ld = cxx
- ar = os.environ.get('AR', 'ar')
+ ar = os.environ.get('AR_host', 'ar')
# QTBUG-64759
# cflags = os.environ.get('CFLAGS', '').split()
|
