diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2019-02-14 12:21:04 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2019-02-18 13:39:13 +0000 |
| commit | 0e1ef598daca014b5df1b756b5b374827b6b3cb6 (patch) | |
| tree | 06e159aef82d65ef07906e99a8debebaf05ea6b0 /src | |
| parent | 65909d55417c78e88308644dea30a65fae2d9c4a (diff) | |
Use qmake toolchain for gn
Pass cc,cxx,ld,ar to gn, so it can be also build with
clang for example.
Updates Chormium:
* bb8520a5 Fix build with sanitizer and icecc
* be3cf3ab Add command line parameters for cc,cxx,ld,ar in gn
* 7056415f Fixup build with older system ICU
* 2b94bfe4 BASELINE: Update Chromium to 71.0.3578.140
Change-Id: I4c1653cc9f21c72571ebe3d60eca4a444cd106d9
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src')
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/buildtools/gn.pro | 5 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject 8d510183ca27142801b56bb50d63cbb2a92d433 +Subproject bb8520a5b4a49085e38b70cb4c95baf75ea374e diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro index 559cdf183..7766af075 100644 --- a/src/buildtools/gn.pro +++ b/src/buildtools/gn.pro @@ -18,7 +18,10 @@ build_pass|!debug_and_release { src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT") gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir)) - gn_configure = $$system_quote($$gn_bootstrap) --no-last-commit-position --out-path $$out_path + gn_configure = $$system_quote($$gn_bootstrap) --no-last-commit-position --out-path $$out_path \ + --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \ + --ld \"$$which($$QMAKE_LINK)\" --ar \"$$which(ar)\" + message($$gn_configure) !system("$$pythonPathForSystem() $$gn_configure") { error("GN generation error!") } |