Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-07-05 16:04:28 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-07-05 17:45:56 (GMT) |
| commit | fa301d45535f8295f429186c2dc83f19479c9d68 (patch) | |
| tree | dd6a61b76978556ec708651e5425a918eb229c6d /BuildTools/SCons | |
| parent | b16a2d1483f59ad93a2171c6c286e12f4ebbf3be (diff) | |
| download | swift-fa301d45535f8295f429186c2dc83f19479c9d68.zip swift-fa301d45535f8295f429186c2dc83f19479c9d68.tar.bz2 | |
Fix building with Qt 5.5.1 on OS X
Since Qt 5.5.1 the packages from qt.io require setting the
rpath for linking.
Test-Information:
Tested building with dist=1 and testing distribution
packages and their used runtime libraries with Qt 5.4.2 and
Qt 5.5.1.
Change-Id: Idc6826a61489842d39c1d6aec3548e26da48e738
Diffstat (limited to 'BuildTools/SCons')
| -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 a0b29ba..31477c6 100644 --- a/BuildTools/SCons/Tools/qt4.py +++ b/BuildTools/SCons/Tools/qt4.py @@ -564,7 +564,7 @@ def enable_modules(self, modules, debug=False, crosscompiling=False, version='4' self.AppendUnique(LIBPATH=[os.path.join('$QTDIR','lib')]) self.AppendUnique(LINKFLAGS="-F$QTDIR/lib") self.AppendUnique(CPPFLAGS="-iframework$QTDIR/lib") - self.AppendUnique(LINKFLAGS="-L$QTDIR/lib") #TODO clean! + self.Append(LINKFLAGS="-Wl,-rpath,$QTDIR/lib") # FIXME: Phonon Hack if version == '4' : |