blob: a9b24c50348ca128351cd3e26b4f4f6482a425d0 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
$NetBSD: patch-aa,v 1.8 2008/10/26 14:02:33 adam Exp $
--- qmake/generators/unix/unixmake2.cpp.orig 2008-09-27 10:58:43.000000000 +0200
+++ qmake/generators/unix/unixmake2.cpp
@@ -228,6 +228,8 @@ UnixMakefileGenerator::writeMakeParts(QT
if(!project->isEmpty("QMAKE_BUNDLE")) {
t << "TARGETD = " << escapeFilePath(var("TARGET_x.y")) << endl;
t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl;
+ } else if(project->isActiveConfig("compile_libtool")) {
+ t << "TARGETD = " << var("TARGET_la") << endl;
} else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
t << "TARGETD = " << escapeFilePath(var("TARGET_x.y.z")) << endl;
t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl;
@@ -978,8 +980,12 @@ void UnixMakefileGenerator::init2()
} else if (project->isActiveConfig("staticlib")) {
project->values("TARGET").first().prepend("lib");
project->values("TARGET").first() += ".a";
- if(project->values("QMAKE_AR_CMD").isEmpty())
+ if(project->values("QMAKE_AR_CMD").isEmpty()) {
+ if(project->isActiveConfig("compile_libtool"))
+ project->variables()["QMAKE_AR_CMD"].append("$(CXX) -o $(TARGET) $(OBJECTS) $(OBJMOC)");
+ else
project->values("QMAKE_AR_CMD").append("$(AR) $(TARGET) $(OBJECTS)");
+ }
} else {
project->values("TARGETA").append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a");
if(project->isActiveConfig("compile_libtool"))
@@ -1430,7 +1436,7 @@ UnixMakefileGenerator::writePkgConfigFil
bundle = bundle.left(suffix);
pkgConfiglibName = "-framework " + bundle + " ";
} else {
- pkgConfiglibDir = "-L${libdir}";
+ pkgConfiglibDir = "-Wl,-R${libdir} -L${libdir}";
pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length());
}
t << pkgConfiglibDir << " " << pkgConfiglibName << " ";
|
