diff options
author | Niels Ole Salscheider <niels_ole@salscheider-online.de> | 2014-03-01 21:26:54 (GMT) |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-13 16:18:51 (GMT) |
commit | 6dc407c3c394b40b526215be9015ff873ce5515d (patch) | |
tree | 6b07110e61df1621255f5ea44a4f3a9e786d2f65 | |
parent | d38ae7ea322bedb16045d0dc4a71498fadfb2dd9 (diff) | |
download | Qt-6dc407c3c394b40b526215be9015ff873ce5515d.zip Qt-6dc407c3c394b40b526215be9015ff873ce5515d.tar.gz Qt-6dc407c3c394b40b526215be9015ff873ce5515d.tar.bz2 |
Remove -fuse-ld=gold from webkit's LFLAGS
This flag is not supported by upstream gcc. Thus the build might fail if the
gold linker is found.
This fixes https://bugs.webkit.org/show_bug.cgi?id=89312.
Change-Id: I931081fccf64a43b32f2aaf2c3ad377391fdad4c
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
-rw-r--r-- | src/3rdparty/webkit/Source/common.pri | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/3rdparty/webkit/Source/common.pri b/src/3rdparty/webkit/Source/common.pri index 0f62e14..093647a 100644 --- a/src/3rdparty/webkit/Source/common.pri +++ b/src/3rdparty/webkit/Source/common.pri @@ -3,13 +3,6 @@ contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1 contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0 -linux-g++ { -isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { - message(Using gold linker) - QMAKE_LFLAGS+=-fuse-ld=gold -} -} - # We use this flag on production branches # See https://bugs.webkit.org/show_bug.cgi?id=60824 CONFIG += production |