diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2016-11-16 12:44:36 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2016-12-08 13:57:14 +0000 |
| commit | bd894e04aa57f7c71041a897fb1fbe2d582ac39c (patch) | |
| tree | 490c3970ce73b1ce518b17f80337c2ba2e66e4b2 /tools/qmake/mkspecs/features | |
| parent | 0c6c48da2ad5c60f5404636290eb82f492c2a1a8 (diff) | |
Add gn rebuild after bootstrap
Change-Id: I30c5a7ede2fa94fda1509443f486d05bea8b9652
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tools/qmake/mkspecs/features')
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 22ce695de..a47e4b7e8 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -400,8 +400,10 @@ defineReplace(buildGn) { !exists($$out) { mkpath($$dirname(out)) src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT") - gn_configure = $$system_path($$absolute_path(chromium/tools/gn/bootstrap/bootstrap.py, $$src_3rd_party_dir)) - system("cd $$system_quote($$system_path($$dirname(out))) && python $$system_quote($$gn_configure) --no-rebuild $$ninja_path") + gn_bootstrap = $$system_path($$absolute_path(chromium/tools/gn/bootstrap/bootstrap.py, $$src_3rd_party_dir)) + gn_args = $$system_quote(is_clang=false use_sysroot=false enable_remoting=false enable_nacl=false) + gn_configure = $$system_quote($$gn_bootstrap) --shadow --gn-gen-args=$$gn_args $$ninja_path + system("cd $$system_quote($$system_path($$dirname(out))) && python $$gn_configure") } } |