diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-02-23 10:37:43 +0100 |
|---|---|---|
| committer | Jüri Valdmann <juri.valdmann@qt.io> | 2018-02-28 10:19:28 +0000 |
| commit | be547f747023190770e0ffcfd9729f0b24f7c3c4 (patch) | |
| tree | 1bd86f510eb24db50aa85c2c859c4e3794460415 | |
| parent | 9dfdfdf5744d3bf0ffea3c380ed37f0ab9273fe5 (diff) | |
| download | qttools-be547f747023190770e0ffcfd9729f0b24f7c3c4.tar.gz | |
qdoc: Don't add clang lib dir in system location to RPATH
If clang is installed in e.g. /usr/lib, then a qdoc binary built with
-developer-build will try to link against libQt5Core.so in /usr/lib and not the
one that's in the build directory.
Change-Id: I5e0e90ec96fd1f84a4dc904a35eec994d639bc9f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| -rw-r--r-- | src/qdoc/qdoc.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qdoc/qdoc.pro b/src/qdoc/qdoc.pro index 363b2f199..38fa8b550 100644 --- a/src/qdoc/qdoc.pro +++ b/src/qdoc/qdoc.pro @@ -14,7 +14,7 @@ qtHaveModule(qmldevtools-private) { LIBS += $$CLANG_LIBS !contains(QMAKE_DEFAULT_INCDIRS, $$CLANG_INCLUDEPATH): INCLUDEPATH += $$CLANG_INCLUDEPATH -!disable_external_rpath: QMAKE_RPATHDIR += $$CLANG_LIBDIR +!contains(QMAKE_DEFAULT_LIBDIRS, $$CLANG_LIBDIR):!disable_external_rpath: QMAKE_RPATHDIR += $$CLANG_LIBDIR DEFINES += $$shell_quote(CLANG_RESOURCE_DIR=\"$${CLANG_LIBDIR}/clang/$${CLANG_VERSION}/include\") DEFINES += \ |