2019-09-16 21:24:52 +02:00
|
|
|
$NetBSD: patch-qmake_generators_makefile.cpp,v 1.4 2019/09/16 19:24:53 adam Exp $
|
2014-12-30 18:23:45 +01:00
|
|
|
|
2018-01-17 20:30:46 +01:00
|
|
|
Pass library path to linker.
|
2014-12-30 18:23:45 +01:00
|
|
|
|
2019-09-16 21:24:52 +02:00
|
|
|
--- qmake/generators/makefile.cpp.orig 2019-08-31 08:29:31.000000000 +0000
|
2014-12-30 18:23:45 +01:00
|
|
|
+++ qmake/generators/makefile.cpp
|
2019-09-16 21:24:52 +02:00
|
|
|
@@ -3387,7 +3387,7 @@ MakefileGenerator::writePkgConfigFile()
|
|
|
|
pkgConfiglibName = bundle.toQString();
|
|
|
|
} else {
|
|
|
|
if (!project->values("QMAKE_DEFAULT_LIBDIRS").contains(libDir))
|
|
|
|
- t << "-L${libdir} ";
|
|
|
|
+ t << "-Wl,-R${libdir} -L${libdir} ";
|
|
|
|
pkgConfiglibName = "-l" + project->first("QMAKE_ORIG_TARGET");
|
|
|
|
if (project->isActiveConfig("shared"))
|
|
|
|
pkgConfiglibName += project->first("TARGET_VERSION_EXT").toQString();
|