diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-07 13:33:59 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-10 11:42:13 +0000 |
commit | 5d0882d44383e357d099e89d95837616bbf8b5a0 (patch) | |
tree | 945b4f99e36a1a74f394055c8a67c1f5fdf21a4e /tools/buildscripts | |
parent | c888c6d5acf18b265572832fd56b92c40867f14d (diff) |
Unite commmon linux platform configuration
Move duplicated linux configuration to linux.pri
Change-Id: I9f6f876e09fb748fb78cfbd5201a4326693f0be9
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'tools/buildscripts')
-rwxr-xr-x | tools/buildscripts/gyp_qtwebengine | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine index 39d9cc4b4..5003e4b5b 100755 --- a/tools/buildscripts/gyp_qtwebengine +++ b/tools/buildscripts/gyp_qtwebengine @@ -139,11 +139,6 @@ if __name__ == '__main__': args.extend(['-D', 'qtwebengine_root=' + purifyGypVarPath(qtwebengine_root)]) args.extend(['-D', 'chromium_src_dir=' + purifyGypVarPath(chrome_src)]) - # linux_use_bundled_gold currently relies on a hardcoded relative path from chromium/src/out/(Release|Debug) - # Disable it along with the -Wl,--threads flag just in case gold isn't installed on the system. - args.extend(['-D', 'linux_use_bundled_gold=0']) - args.extend(['-D', 'linux_use_bundled_binutils=0']) - args.extend(['-D', 'linux_use_gold_flags=0']) args.extend(['-D', 'clang_use_chrome_plugins=0']) # We do not want to ship more external binary blobs, so let v8 embed its startup data. args.extend(['-D', 'v8_use_external_startup_data=0']) |