| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 8403634a71f067eec514b6d2193cf41e281dff8e Mon Sep 17 00:00:00 2001 |
| 2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> |
| 3 | Date: Wed, 26 Sep 2012 20:47:08 +0200 |
| 4 | Subject: [PATCH 16/21] configure: eval QMAKE_CXX |
| 5 | |
| 6 | Allow expansion of $(...) references in QMAKE_CXX (currently its value |
| 7 | is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed |
| 8 | which allows WebKit to be enabled. |
| 9 | |
| 10 | Upstream-Status: Pending |
| 11 | |
| 12 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
| 13 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 14 | |
| 15 | Conflicts: |
| 16 | configure |
| 17 | --- |
| 18 | configure | 3 ++- |
| 19 | 1 file changed, 2 insertions(+), 1 deletion(-) |
| 20 | |
| 21 | diff --git a/configure b/configure |
| 22 | index d02824b..891d6e7 100755 |
| 23 | --- a/configure |
| 24 | +++ b/configure |
| 25 | @@ -3409,7 +3409,8 @@ else |
| 26 | CFG_FRAMEWORK=no |
| 27 | fi |
| 28 | |
| 29 | -QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX` |
| 30 | +QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'` |
| 31 | +QMAKE_CONF_COMPILER=`eval "echo $QMAKE_CONF_COMPILER"` |
| 32 | TEST_COMPILER="$CXX" |
| 33 | |
| 34 | [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER |
| 35 | -- |
| 36 | 1.8.0 |
| 37 | |