diff options
| author | Zeno Albisser <zeno.albisser@nokia.com> | 2010-03-08 18:15:57 +0100 |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@nokia.com> | 2010-03-09 13:29:17 +0100 |
| commit | 53795b645d82afc30a0527523e3fad2a763779e2 (patch) | |
| tree | 7b623cd016962c5f7b7427b07e1943092a5d65d0 /configure | |
| parent | 7ce5c2b88b5523e97deb4f95d236e37666f4818e (diff) | |
| download | qt4-tools-53795b645d82afc30a0527523e3fad2a763779e2.tar.gz | |
Changed TEST_COMPILER from CC to CXX in configure script.
We are using a cpp file for testing the compiler. Because of that we
have to use a c++ compiler for the test as well.
But if there was a CC variable defined, this one was used instead
of CXX for the compiler test.
This resulted in a missing QMAKE_LFLAGS definition in .qmake.cache.
Due to this, the -L/path/to/QTDIR/lib was missing too and
assistant could not be linked to libQtCLucene.so.4.
Reviewed-by: Marius Storm-Olsen
Task-number: QTBUG-8808,QTBUG-5471,QTBUG-5385,QTBUG-5774
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2976,7 +2976,7 @@ else fi QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1` -TEST_COMPILER="$CC" +TEST_COMPILER="$CXX" [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER if [ -z "$TEST_COMPILER" ]; then echo "ERROR: Cannot set the compiler for the configuration tests" |