diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-02-04 14:37:24 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-02-04 15:22:31 (GMT) |
| commit | 09c8071d634e043b8706f876e05e6b9e37343251 (patch) | |
| tree | 717495cd18b814053261e09304df9bfdd1b7fd39 /src | |
| parent | b8705c3dd756243503fd1e469f6ac4907222b321 (diff) | |
| download | Qt-09c8071d634e043b8706f876e05e6b9e37343251.zip Qt-09c8071d634e043b8706f876e05e6b9e37343251.tar.gz Qt-09c8071d634e043b8706f876e05e6b9e37343251.tar.bz2 | |
Fix linking for armlink
using
LIBS += -LanyDir
is wrong as that depends on 'ld' accepting -L
the correct cross-platform approach is to use
QMAKE_LIBDIR += anyDir
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pri | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index b3ee948..4cdb329 100644 --- a/src/tools/bootstrap/bootstrap.pri +++ b/src/tools/bootstrap/bootstrap.pri @@ -42,12 +42,12 @@ hpux-acc*|hpuxi-acc* { } else { contains(CONFIG, debug_and_release_target) { CONFIG(debug, debug|release) { - LIBS+=-L$$QT_BUILD_TREE/src/tools/bootstrap/debug + QMAKE_LIBDIR += $$QT_BUILD_TREE/src/tools/bootstrap/debug } else { - LIBS+=-L$$QT_BUILD_TREE/src/tools/bootstrap/release + QMAKE_LIBDIR += $QT_BUILD_TREE/src/tools/bootstrap/release } } else { - LIBS += -L$$QT_BUILD_TREE/src/tools/bootstrap + QMAKE_LIBDIR += $QT_BUILD_TREE/src/tools/bootstrap } LIBS += -lbootstrap } |