diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-09-28 03:24:07 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-01 13:11:57 +0200 |
| commit | 45a5c006d12c38d17f5605c2f975a7eabda7456f (patch) | |
| tree | a038368ae7292d7a7f9d459ea37caa1e1520502a /build/gyp_qtwebengine | |
| parent | 8608404f7991b910381e7b402f80b502177f4d6a (diff) | |
Allow overriding target compiler and linker with qmake's one
Using make_global_settings, we can pass along the compiler and linker
that qmake uses, still allowing overriding it through environment variables.
We generate qmake_extras.gypi and populated with the host and target compilers
so that it also works when cross compiling.
Based on patch by Pierre Rossi <pierre.rossi@digia.com>
Change-Id: Ia3789abeea88f4d3cde75c2cf07cc9de66d7afbf
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'build/gyp_qtwebengine')
| -rwxr-xr-x | build/gyp_qtwebengine | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/build/gyp_qtwebengine b/build/gyp_qtwebengine index b67314df2..bd7347e4a 100755 --- a/build/gyp_qtwebengine +++ b/build/gyp_qtwebengine @@ -65,6 +65,9 @@ def additional_include_files(args=[]): # Used for additional build tweaks such as file exclusions AddInclude(os.path.join(qtwebengine_src, 'build', 'qtwebengine_extras.gypi')) + # Common stuff we generate and extract from qmake + AddInclude(os.path.join(qtwebengine_src, 'build', 'qmake_extras.gypi')) + # Optionally add supplemental .gypi files if present. supplements = glob.glob(os.path.join(chrome_src, '*', 'supplement.gypi')) for supplement in supplements: |