diff options
Diffstat (limited to 'src/buildtools/gn.pro')
| -rw-r--r-- | src/buildtools/gn.pro | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro index f66f4bd68..559cdf183 100644 --- a/src/buildtools/gn.pro +++ b/src/buildtools/gn.pro @@ -3,30 +3,26 @@ option(host_build) !debug_and_release: CONFIG += release -include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) -QT_FOR_CONFIG += webengine webengine-private +include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) +QT_FOR_CONFIG += webenginecore-private build_pass|!debug_and_release { !qtConfig(webengine-system-gn): CONFIG(release, debug|release) { buildgn.target = build_gn - gn_args = $$gnArgs() out = $$gnPath() - !qtConfig(webengine-system-ninja): ninja_path = "--path $$ninjaPath()" + out_path = $$dirname(out) + !qtConfig(webengine-system-ninja): ninja_path = $$ninjaPath() + else: ninja_path="ninja" # check if it is not already build !exists($$out) { - mkpath($$dirname(out)) src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT") - gn_bootstrap = $$system_path($$absolute_path(chromium/tools/gn/bootstrap/bootstrap.py, $$src_3rd_party_dir)) + gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir)) - gn_args = $$system_quote($$gn_args) - win32:isDeveloperBuild() { - # GN is always built in release mode, which conflicts with incremental linking when - # doing a developer build of WebEngine. - gn_args = $$replace(gn_args, "use_incremental_linking=true ", "") + gn_configure = $$system_quote($$gn_bootstrap) --no-last-commit-position --out-path $$out_path + !system("$$pythonPathForSystem() $$gn_configure") { + error("GN generation error!") } - - gn_configure = $$system_quote($$gn_bootstrap) --shadow --gn-gen-args=$$gn_args $$ninja_path - !system("cd $$system_quote($$system_path($$dirname(out))) && $$pythonPathForSystem() $$gn_configure") { + !system("cd $$system_quote($$system_path($$out_path)) && $$ninja_path $$basename(out)" ) { error("GN build error!") } } |