Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-04-14 09:46:57 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-04-14 10:54:40 (GMT) |
| commit | f0820ff2e2f2c77c3d3a6572cdf7518ec8a76ef0 (patch) | |
| tree | aed8ba926dc288aa66204eb8b4d46533a886714d | |
| parent | a83ddaace71688abc7f2b6a6dd1b821f2194e890 (diff) | |
| download | swift-f0820ff2e2f2c77c3d3a6572cdf7518ec8a76ef0.zip swift-f0820ff2e2f2c77c3d3a6572cdf7518ec8a76ef0.tar.bz2 | |
Set QT_SELECT environment variable during scons build
This enables building on Gentoo.
Test-Information:
A user successfully built with this patch and both Qt4 and Qt5
installed.
Change-Id: I81ada408d34208bbba22d30de5f4ecd0060e223f
| -rw-r--r-- | BuildTools/SCons/SConscript.boot | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot index 407573b..df15937 100644 --- a/BuildTools/SCons/SConscript.boot +++ b/BuildTools/SCons/SConscript.boot @@ -181,6 +181,13 @@ if env["PLATFORM"] == "darwin" and env["target"] == "native" : if platform.machine() == "x86_64" : env.Append(LINKFLAGS = ["-arch", "x86_64"]) +# Set QT_SELECT variable to enable building on systems that have Qt4 and Qt5 installed and use qtselect +if env["PLATFORM"] != "darwin" and env["PLATFORM"] != "win32" : + if env["qt5"] : + env["ENV"]["QT_SELECT"] = "qt5" + else: + env["ENV"]["QT_SELECT"] = "qt4" + # Check whether we are running inside scan-build, and override compiler if so if "CCC_ANALYZER_HTML" in os.environ : for key, value in os.environ.items() : |