diff options
| author | Kang Kai <kai.kang@windriver.com> | 2011-08-25 10:55:40 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-29 13:48:02 +0100 |
| commit | e70a369d2aabcf0df2cb76a837bc54bddba55a8c (patch) | |
| tree | 520ae8780956eb520512f8a4d9b356161203d772 | |
| parent | 4d8b2dae003ede7d3de9e7c3ab533a4cfc2b4075 (diff) | |
| download | poky-e70a369d2aabcf0df2cb76a837bc54bddba55a8c.tar.gz | |
cmake-nativesdk: remove gcc standard paths
Because of the gcc-crosssdk bug, cmake-nativesdk needs to search gcc
standard paths itself. Right now it was fixed, so remove the additional
CXXFLAG for cmake-nativesdk.
(From OE-Core rev: bac15cc98e136892d4c09f2470622965bd9dbbeb)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake_2.8.5.bb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/meta/recipes-devtools/cmake/cmake_2.8.5.bb b/meta/recipes-devtools/cmake/cmake_2.8.5.bb index 64e7574677..4fa9562a4b 100644 --- a/meta/recipes-devtools/cmake/cmake_2.8.5.bb +++ b/meta/recipes-devtools/cmake/cmake_2.8.5.bb | |||
| @@ -4,7 +4,7 @@ inherit cmake | |||
| 4 | 4 | ||
| 5 | DEPENDS += "curl expat zlib libarchive ncurses" | 5 | DEPENDS += "curl expat zlib libarchive ncurses" |
| 6 | 6 | ||
| 7 | PR = "${INC_PR}.1" | 7 | PR = "${INC_PR}.2" |
| 8 | 8 | ||
| 9 | SRC_URI += "file://dont-run-cross-binaries.patch" | 9 | SRC_URI += "file://dont-run-cross-binaries.patch" |
| 10 | 10 | ||
| @@ -33,12 +33,6 @@ EXTRA_OECMAKE=" \ | |||
| 33 | ${@base_contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \ | 33 | ${@base_contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \ |
| 34 | " | 34 | " |
| 35 | 35 | ||
| 36 | # FIXME: Hack due gcc-crosssdk not being able to detect those automatically | ||
| 37 | CXXFLAGS_virtclass-nativesdk += " \ | ||
| 38 | -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/c++ \ | ||
| 39 | -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/c++/${TARGET_SYS} \ | ||
| 40 | " | ||
| 41 | |||
| 42 | FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION}" | 36 | FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION}" |
| 43 | FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}" | 37 | FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}" |
| 44 | 38 | ||
