From ec9d722e08c636e0c672b0adc3b54569367c6502 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 26 Sep 2012 20:47:08 +0200 Subject: [PATCH 16/20] configure: eval QMAKE_CXX Allow expansion of $(...) references in QMAKE_CXX (currently its value is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed which allows WebKit to be enabled. Upstream-Status: Pending Signed-off-by: Paul Eggleton Signed-off-by: Martin Jansa Conflicts: configure --- configure | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure b/configure index d1a0dfd..9f59e1a 100755 --- a/configure +++ b/configure @@ -3438,6 +3438,7 @@ else fi -QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX` +QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'` +QMAKE_CONF_COMPILER=`eval "echo $QMAKE_CONF_COMPILER"` TEST_COMPILER="$CXX" [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER -- 1.7.12