summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@nokia.com>2010-10-13 20:48:24 (GMT)
committerTor Arne Vestbø <tor.arne.vestbo@nokia.com>2010-10-13 20:55:36 (GMT)
commit133f510ce7e310d3bbd6aeb57de510d491fe6022 (patch)
treeeaed5f655269ddc0fd00584af9ad5ab2b791d847 /configure
parent86636e0c4ab91bfb60be1e18d6daff34d41a5927 (diff)
downloadQt-133f510ce7e310d3bbd6aeb57de510d491fe6022.zip
Qt-133f510ce7e310d3bbd6aeb57de510d491fe6022.tar.gz
Qt-133f510ce7e310d3bbd6aeb57de510d491fe6022.tar.bz2
configure: Don't assume that QMAKE_CXX will be found at the start of line
Change 86636e0c4ab introduced "isEmpty(QMAKE_CXX): QMAKE_CXX = g++" instead of "QMAKE_CXX = g++", which failed when configure was looking for QMAKE_CXX at the beginning of the line. We now allow either the beginning of the line or a space before QMAKE_CXX.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index bf81e26..f6f5cfb 100755
--- a/configure
+++ b/configure
@@ -3162,7 +3162,7 @@ else
CFG_FRAMEWORK=no
fi
-QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1`
+QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "\(^\|\s\)QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1`
TEST_COMPILER="$CXX"
[ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER