diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-08-15 13:22:36 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-08-16 08:54:37 +0300 |
| commit | 7beedb16cd1ab7afd7ace29a2eea3f5f7d7140a3 (patch) | |
| tree | 3d949c250bf8a45046a4fb7e4421260776d961ba /recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | |
| parent | 826c0b1092ede76f17de3b232ba7cc17a5be5830 (diff) | |
| parent | 41e4144d4d8c50b52ed6224a28f2ca4042c1e5b2 (diff) | |
| download | meta-qt5-7beedb16cd1ab7afd7ace29a2eea3f5f7d7140a3.tar.gz | |
Merge remote-tracking branch 'qtyocto/5.9' into 5.10
* qtyocto/5.9:
qt5: update submodules
qtbase: update to 5.9.1 RC3
qt5: update submodules
qt5: update submodules
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.9
qt5: update submodules
qtwebengine: fix build with latest oe-core
qtremoteobjects: build repc tool for native and nativesdk
qtlocation: make mapbox-gl plugin a PACKAGECONFIG option
qtwebview: add recipe for Qt WebView
qtbase: update to 5.9.0 RC2
Change-Id: Icc5a568edf1f21032a4746eb003bcb111d01bc0f
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch index 130f3a38..e10d3b82 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | |||
| @@ -52,8 +52,8 @@ index 75b9690..601f688 100755 | |||
| 52 | else: | 52 | else: |
| 53 | - cc = os.environ.get('CC', 'cc') | 53 | - cc = os.environ.get('CC', 'cc') |
| 54 | - cxx = os.environ.get('CXX', 'c++') | 54 | - cxx = os.environ.get('CXX', 'c++') |
| 55 | + cc = os.environ.get('CC_host', 'cc') | 55 | + cc = os.environ.get('CC_host', 'gcc') |
| 56 | + cxx = os.environ.get('CXX_host', 'c++') | 56 | + cxx = os.environ.get('CXX_host', 'g++') |
| 57 | ld = cxx | 57 | ld = cxx |
| 58 | - ar = os.environ.get('AR', 'ar') | 58 | - ar = os.environ.get('AR', 'ar') |
| 59 | + ar = os.environ.get('AR_host', 'ar') | 59 | + ar = os.environ.get('AR_host', 'ar') |