diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-06-21 12:25:21 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-06-21 12:25:43 +0200 |
| commit | 676b37c082b6b2d5e5041192140b558adbeb23c7 (patch) | |
| tree | 00c2facef853dd3d2369d3ab86c9b5f367edf408 /build | |
| parent | 5999b66ed4c64ee3bed68c7d015c16e67137f5fe (diff) | |
Fix the build when binutils-gold isn't installed.
Ideally we should find a way to use the binaries available
in src/third_parth/gold.
Diffstat (limited to 'build')
| -rwxr-xr-x | build/gyp_qtwebengine | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/build/gyp_qtwebengine b/build/gyp_qtwebengine index 53280954c..fd68af853 100755 --- a/build/gyp_qtwebengine +++ b/build/gyp_qtwebengine @@ -113,6 +113,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]) + # 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']) + args.extend(['-D', 'linux_use_gold_flags=0']) # Tweak the output location and format (hardcode ninja for now) args.extend(['--generator-output', os.path.abspath(get_output_dir())]) args.extend(['-Goutput_dir='+ os.path.abspath(get_output_dir())]) |