diff options
| author | Zeno Albisser <zeno.albisser@nokia.com> | 2010-03-15 11:00:02 (GMT) |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@nokia.com> | 2010-03-17 16:17:27 (GMT) |
| commit | d6ab68fbd22b2d057b0e32e1bfc73a5e7dc9327d (patch) | |
| tree | aad2553d0da8c8b02ee72b5e8a423dba86a9444d | |
| parent | 3d6f1ebf1dbdefc443aa4f8e7d18755383794156 (diff) | |
| download | Qt-d6ab68fbd22b2d057b0e32e1bfc73a5e7dc9327d.zip Qt-d6ab68fbd22b2d057b0e32e1bfc73a5e7dc9327d.tar.gz Qt-d6ab68fbd22b2d057b0e32e1bfc73a5e7dc9327d.tar.bz2 | |
Force qt-zlib to be used for host system when cross compiling.
There is no possibility to define which zlib should be used for the
bootstrapped tools when cross compiling.
Therefor we will force qt-zlib to be used for bootstrapped tools.
Reviewed-by: Marius Storm-Olsen
Task-number: QTBUG-8678
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pri | 2 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index b3ee948..6442526 100644 --- a/src/tools/bootstrap/bootstrap.pri +++ b/src/tools/bootstrap/bootstrap.pri @@ -51,7 +51,7 @@ hpux-acc*|hpuxi-acc* { } LIBS += -lbootstrap } -!contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib) { +!contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib):!cross_compile { unix:LIBS += -lz # win32:LIBS += libz.lib } diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 0dbb90f..7e91333 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -95,7 +95,7 @@ macx: { LIBS += -framework CoreServices } -contains(QT_CONFIG, zlib) { +contains(QT_CONFIG, zlib)|cross_compile { INCLUDEPATH += ../../3rdparty/zlib SOURCES+= \ ../3rdparty/zlib/adler32.c \ |