diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-11-25 19:21:19 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-26 12:01:46 +0100 |
| commit | 3c4ccfaa280a3fe4a737b8c585ce441849dfae3b (patch) | |
| tree | 8245ec373fd0d57f0503442cf2567dc8dfe037ff /build/gyp_qtwebengine | |
| parent | 4269f9b3db3cdcb0e7bccf12161a1426cd6654b7 (diff) | |
Add build system support for cross compilation
This patch adds support for inheriting target specific cross-compile
settings from Qt.
Change-Id: I964297d776bcc5ac169ce09a52f661d08c5b4b9d
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Arvid Nilsson <anilsson@blackberry.com>
Diffstat (limited to 'build/gyp_qtwebengine')
| -rwxr-xr-x | build/gyp_qtwebengine | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build/gyp_qtwebengine b/build/gyp_qtwebengine index 8a5695ed2..e715cb821 100755 --- a/build/gyp_qtwebengine +++ b/build/gyp_qtwebengine @@ -28,6 +28,7 @@ import gyp # Add paths so that pymod_do_main(...) can import files. sys.path.insert(1, os.path.join(chrome_src, 'tools', 'grit')) +sys.path.insert(1, os.path.join(chrome_src, 'tools', 'generate_shim_headers')) sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit', 'Source', 'core', 'core.gyp', 'scripts')) @@ -135,6 +136,10 @@ if __name__ == '__main__': args.extend(["--depth=" + chrome_src]) args.extend(['-D', 'qtwebengine_src_dir=' + qtwebengine_src]) args.extend(['-D', 'chromium_src_dir=' + chrome_src]) + + if 'qt_cross_compile=1' in sys.argv: + os.environ['GYP_CROSSCOMPILE'] = '1' + # linux_use_gold_binary 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_gold_binary=0']) |