diff options
Diffstat (limited to '0018-Enable-rpath-for-build-tools.patch')
| -rw-r--r-- | 0018-Enable-rpath-for-build-tools.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/0018-Enable-rpath-for-build-tools.patch b/0018-Enable-rpath-for-build-tools.patch index 2e71cd2f58e6..da85858cca1d 100644 --- a/0018-Enable-rpath-for-build-tools.patch +++ b/0018-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From 664fce69abcad0d7c10013b51b42a1a34c27f279 Mon Sep 17 00:00:00 2001 +From 9baddb1d9432c91c6f4e7f8687d13fa7e38308d3 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 18/33] Enable rpath for build tools @@ -13,18 +13,18 @@ Change-Id: I9808062a66406cdec7446a75150b40b2f30038c7 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf -index 883f8ca215..786f2e660c 100644 +index 8354f30eea..30e8cf18c5 100644 --- a/mkspecs/features/qt_app.prf +++ b/mkspecs/features/qt_app.prf -@@ -24,6 +24,7 @@ isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle - QMAKE_LFLAGS += $$QMAKE_LFLAGS_GCSECTIONS +@@ -21,6 +21,7 @@ isEmpty(QMAKE_TARGET_DESCRIPTION): \ + isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle host_build: QT -= gui # no host tool will ever use gui +host_build: QMAKE_RPATHDIR += $$[QT_INSTALL_LIBS/dev] # force rpath host_build:force_bootstrap { !build_pass:qtConfig(release_tools): CONFIG += release contains(QT, core(-private)?|xml) { -@@ -34,7 +35,6 @@ host_build:force_bootstrap { +@@ -31,7 +32,6 @@ host_build:force_bootstrap { } else { !build_pass:qtConfig(debug_and_release): CONFIG += release target.path = $$[QT_INSTALL_BINS] @@ -33,5 +33,5 @@ index 883f8ca215..786f2e660c 100644 INSTALLS += target -- -2.19.0 +2.19.2 |