| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From d2bb701b551402f0befddd0e906423596bdc0df7 Mon Sep 17 00:00:00 2001 |
| 2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> |
| 3 | Date: Wed, 26 Sep 2012 20:48:37 +0200 |
| 4 | Subject: [PATCH 17/21] configure: ensure we identify the compiler as g++ in |
| 5 | configure |
| 6 | |
| 7 | Our PLATFORM in OE is ${TARGET_OS}-oe-g++, and previously the configure |
| 8 | script was interpreting from this that the compiler was "oe-g++" and |
| 9 | thus |
| 10 | g++ specific checks were not being run since this string did not match; |
| 11 | among other things this resulted in a compiler version check in the |
| 12 | QtWebKit build code not working, and hence the following error at build |
| 13 | time: |
| 14 | |
| 15 | ./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword |
| 16 | in C++0x [-Werror=c++0x-compat] |
| 17 | |
| 18 | The easiest thing since our PLATFORM is entirely artificial is to just |
| 19 | force COMPILER to "g++" in the configure script if it is detected as |
| 20 | "oe-g++". |
| 21 | |
| 22 | Upstream-Status: Inappropriate [configuration] |
| 23 | |
| 24 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
| 25 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 26 | --- |
| 27 | configure | 3 +++ |
| 28 | 1 file changed, 3 insertions(+) |
| 29 | |
| 30 | diff --git a/configure b/configure |
| 31 | index 891d6e7..7031898 100755 |
| 32 | --- a/configure |
| 33 | +++ b/configure |
| 34 | @@ -7592,6 +7592,9 @@ elif [ "$XPLATFORM" != "$PLATFORM" ]; then |
| 35 | else |
| 36 | COMPILER=`echo $PLATFORM | cut -f 2- -d-` |
| 37 | fi |
| 38 | +case $COMPILER in |
| 39 | + *oe-g++) COMPILER="g++" ;; |
| 40 | +esac |
| 41 | if [ "$CFG_EXCEPTIONS" = "unspecified" -a "$PLATFORM_QWS" = "yes" ]; then |
| 42 | CFG_EXCEPTIONS=no |
| 43 | fi |
| 44 | -- |
| 45 | 1.8.0 |
| 46 | |