Patchwork [CONSOLIDATED,PULL,08/21] cmake-nativesdk: remove gcc standard paths

login
register
mail settings
Submitter Saul Wold
Date Aug. 26, 2011, 7:39 p.m.
Message ID <bac15cc98e136892d4c09f2470622965bd9dbbeb.1314387279.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/10655/
State New, archived
Headers show

Comments

Saul Wold - Aug. 26, 2011, 7:39 p.m.
From: Kang Kai <kai.kang@windriver.com>

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.

Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
 meta/recipes-devtools/cmake/cmake_2.8.5.bb |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

Patch

diff --git a/meta/recipes-devtools/cmake/cmake_2.8.5.bb b/meta/recipes-devtools/cmake/cmake_2.8.5.bb
index 64e7574..4fa9562 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
 
 DEPENDS += "curl expat zlib libarchive ncurses"
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 SRC_URI += "file://dont-run-cross-binaries.patch"
 
@@ -33,12 +33,6 @@  EXTRA_OECMAKE=" \
     ${@base_contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \
 "
 
-# FIXME: Hack due gcc-crosssdk not being able to detect those automatically
-CXXFLAGS_virtclass-nativesdk += " \
-   -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/c++ \
-   -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/c++/${TARGET_SYS} \
-   "
-
 FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION}"
 FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}"