summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2016-08-30 12:07:20 -0700
committerThiago Macieira <thiago.macieira@intel.com>2016-08-31 19:22:34 +0000
commit8cfac7fba69b9c903672e9f8eca9b8b752c640eb (patch)
treef9b815a54a79bafd37f6fba82794e0affecad937
parentb09e0636f8c781f5643d7582706bfcfc47106e7c (diff)
configure: ask pkg-config only for the info we're interested
No need to get libs flags other than -L and -l, since we're adding everything to the LIBS variable in qmake anyway. We wouldn't want rpath or other linker flags to leak through. Change-Id: I7d42fe4b581e49df891cfffd146fab61fecbc5c9 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r--mkspecs/features/qt_configure.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index 536ae2cd8a..bb93e3cffd 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -487,7 +487,7 @@ defineTest(qtConfLibrary_pkgConfig) {
return(false)
qtRunLoggedCommand("$$pkg_config --modversion $$args", version)|return(false)
- qtRunLoggedCommand("$$pkg_config --libs $$args", $${1}.libs)|return(false)
+ qtRunLoggedCommand("$$pkg_config --libs-only-L --libs-only-l $$args", $${1}.libs)|return(false)
qtRunLoggedCommand("$$pkg_config --cflags $$args", $${1}.cflags)|return(false)
qtRunLoggedCommand("$$pkg_config --cflags-only-I $$args", includes)|return(false)
eval(includes = $$includes)