diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-09-09 12:28:54 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-09-09 11:42:13 +0000 |
| commit | f590b159c56d9112ae8f6f2aeb960a365a881ac5 (patch) | |
| tree | a5d6ba95c223814b44c7138d7bbb46cc76481e14 /tools | |
| parent | dc16cdd60449112343d43852960142db7fd155fd (diff) | |
do not generate qmake_extras.gypi in the source directory
Among other things, we store the used compiler in there. This
information belongs into the build directory. Otherwise switching
toolchains becomes challenging.
Task-number: QTBUG-43014
Change-Id: I9bec26a235f5251322792632d4667cc71210286d
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/buildscripts/gyp_qtwebengine | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine index 970cce54e..6db73519a 100755 --- a/tools/buildscripts/gyp_qtwebengine +++ b/tools/buildscripts/gyp_qtwebengine @@ -57,13 +57,19 @@ def additional_include_files(args=[]): # Always include common.gypi. AddInclude(os.path.join(script_dir, 'common.gypi')) - # Include extra gypi files for additional build tweaks such as file exclusions, - # common stuff we generate and extract from qmake and platform specific drop-in files. + # Include extra gypi files for additional build tweaks such as file exclusions + # and platform specific drop-in files. build_extras = glob.glob(os.path.join(qtwebengine_root, 'src', 'core', '*_extras.gypi')) for build in build_extras: print "Using extra options found in " + build AddInclude(build) + # Include extra gypi files for common stuff we generate and extract from qmake. + build_extras = glob.glob(os.path.join(output_dir, '*_extras.gypi')) + for build in build_extras: + print "Using extra options found in " + build + AddInclude(build) + # Optionally add supplemental .gypi files if present. supplements = glob.glob(os.path.join(chrome_src, '*', 'supplement.gypi')) for supplement in supplements: |