Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-07-25 13:01:27 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-07-25 13:01:27 (GMT) |
| commit | 1759abcc579bbd602f5ea5d59cfbdcb8a4e94fea (patch) | |
| tree | dcdd10ce9b482b125d868f58cce0c8b8df0061a5 /BuildTools | |
| parent | 3679c59d32a65f93ad404698bdaa9a16bdd0c28a (diff) | |
| download | swift-1759abcc579bbd602f5ea5d59cfbdcb8a4e94fea.zip swift-1759abcc579bbd602f5ea5d59cfbdcb8a4e94fea.tar.bz2 | |
Improve Qt detection on Linux by setting correct environment
Pass along current scons process environment to the Popen
call that detects Qt MOC version. This is required for Linux
distributions that use qtchooser.
This fixes building Swift on Gentoo.
Test-Information.
None.
Change-Id: I8a1f18af5b8a7bdfe86b262ab38088d0700aab8d
Diffstat (limited to 'BuildTools')
| -rw-r--r-- | BuildTools/SCons/Tools/qt4.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py index 0e248d9..f3678d7 100644 --- a/BuildTools/SCons/Tools/qt4.py +++ b/BuildTools/SCons/Tools/qt4.py @@ -209,7 +209,7 @@ def _detect(env): moc = env.WhereIs('moc-qt4') or env.WhereIs('moc4') or env.WhereIs('moc') if moc: # Test whether the moc command we found is real, or whether it is just the qtchooser dummy. - p = subprocess.Popen([moc, "-v"], shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + p = subprocess.Popen([moc, "-v"], shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env["ENV"]) p.communicate() if p.returncode == 0: import sys |