diff options
| author | Cody P Schafer <dev@codyps.com> | 2014-11-11 20:30:40 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-05 18:01:04 +0000 |
| commit | 60d504b431fa7cdc6ded141def7ae18edb1834e5 (patch) | |
| tree | a604d2337818b47c15441086dbd97ac381577a18 /meta | |
| parent | 54d020345ebde2c3e7044b144e829e14b4f81f3d (diff) | |
| download | poky-60d504b431fa7cdc6ded141def7ae18edb1834e5.tar.gz | |
cmake: supply CMAKE_AR in toolchain file
(From OE-Core rev: 79144da00f005b5a3ab8f7404730216cfc684616)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/cmake.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index 10f8f98b2e..3549c38f15 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass | |||
| @@ -13,6 +13,7 @@ inherit autotools | |||
| 13 | # C/C++ Compiler (without cpu arch/tune arguments) | 13 | # C/C++ Compiler (without cpu arch/tune arguments) |
| 14 | OECMAKE_C_COMPILER ?= "`echo ${CC} | sed 's/^\([^ ]*\).*/\1/'`" | 14 | OECMAKE_C_COMPILER ?= "`echo ${CC} | sed 's/^\([^ ]*\).*/\1/'`" |
| 15 | OECMAKE_CXX_COMPILER ?= "`echo ${CXX} | sed 's/^\([^ ]*\).*/\1/'`" | 15 | OECMAKE_CXX_COMPILER ?= "`echo ${CXX} | sed 's/^\([^ ]*\).*/\1/'`" |
| 16 | OECMAKE_AR ?= "${AR}" | ||
| 16 | 17 | ||
| 17 | # Compiler flags | 18 | # Compiler flags |
| 18 | OECMAKE_C_FLAGS ?= "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${CFLAGS}" | 19 | OECMAKE_C_FLAGS ?= "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${CFLAGS}" |
| @@ -35,6 +36,7 @@ set( CMAKE_SYSTEM_PROCESSOR ${TARGET_ARCH} ) | |||
| 35 | set( CMAKE_C_COMPILER ${OECMAKE_C_COMPILER} ) | 36 | set( CMAKE_C_COMPILER ${OECMAKE_C_COMPILER} ) |
| 36 | set( CMAKE_CXX_COMPILER ${OECMAKE_CXX_COMPILER} ) | 37 | set( CMAKE_CXX_COMPILER ${OECMAKE_CXX_COMPILER} ) |
| 37 | set( CMAKE_ASM_COMPILER ${OECMAKE_C_COMPILER} ) | 38 | set( CMAKE_ASM_COMPILER ${OECMAKE_C_COMPILER} ) |
| 39 | set( CMAKE_AR ${OECMAKE_AR} CACHE FILEPATH "Archiver" ) | ||
| 38 | set( CMAKE_C_FLAGS "${OECMAKE_C_FLAGS}" CACHE STRING "CFLAGS" ) | 40 | set( CMAKE_C_FLAGS "${OECMAKE_C_FLAGS}" CACHE STRING "CFLAGS" ) |
| 39 | set( CMAKE_CXX_FLAGS "${OECMAKE_CXX_FLAGS}" CACHE STRING "CXXFLAGS" ) | 41 | set( CMAKE_CXX_FLAGS "${OECMAKE_CXX_FLAGS}" CACHE STRING "CXXFLAGS" ) |
| 40 | set( CMAKE_ASM_FLAGS "${OECMAKE_C_FLAGS}" CACHE STRING "ASM FLAGS" ) | 42 | set( CMAKE_ASM_FLAGS "${OECMAKE_C_FLAGS}" CACHE STRING "ASM FLAGS" ) |