From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mo-p00-ob6.rzone.de ([2a01:238:20a:202:53f0::1]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1RuiNS-0003DS-3O for ptxdist@pengutronix.de; Tue, 07 Feb 2012 11:34:23 +0100 Received: from mail.rsi.local (p5091E977.dip.t-dialin.net [80.145.233.119]) by smtp.strato.de (jimi mo31) (RZmta 27.6 DYNA|AUTH) with (RC4-MD5 encrypted) ESMTPA id e01698o17A4P6i for ; Tue, 7 Feb 2012 11:34:03 +0100 (MET) From: Josef Holzmayr Date: Tue, 7 Feb 2012 11:33:55 +0100 Message-Id: <1328610835-18531-1-git-send-email-holzmayr@rsi-elektrotechnik.de> Subject: [ptxdist] [PATCH] cmake: add toolchain sysroot to search directive Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1863759521==" Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de --===============1863759521== Content-Type: text/plain Signed-off-by: Josef Holzmayr --- config/cmake/toolchain-target.cmake.in | 2 +- scripts/lib/ptxd_make_cmake_toolchain.sh | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/config/cmake/toolchain-target.cmake.in b/config/cmake/toolchain-target.cmake.in index d316db5..e97fe6c 100644 --- a/config/cmake/toolchain-target.cmake.in +++ b/config/cmake/toolchain-target.cmake.in @@ -14,7 +14,7 @@ SET(CMAKE_C_COMPILER @CC@) SET(CMAKE_CXX_COMPILER @CXX@) # where is the target environment -SET(CMAKE_FIND_ROOT_PATH @SYSROOT@) +SET(CMAKE_FIND_ROOT_PATH @SYSROOT@ @SYSROOT_TOOLCHAIN@) # additional search directories include_directories( @INCLUDE_DIRECTORIES@) diff --git a/scripts/lib/ptxd_make_cmake_toolchain.sh b/scripts/lib/ptxd_make_cmake_toolchain.sh index 4848475..7a3302a 100644 --- a/scripts/lib/ptxd_make_cmake_toolchain.sh +++ b/scripts/lib/ptxd_make_cmake_toolchain.sh @@ -33,6 +33,7 @@ ptxd_make_cmake_toolchain_target() { CXX="$(which "${CXX}")" \ \ SYSROOT="${PTXDIST_PATH_SYSROOT_ALL//:/ }" \ + SYSROOT_TOOLCHAIN="${PTXDIST_SYSROOT_TOOLCHAIN//:/ }" \ INCLUDE_DIRECTORIES="${sysroot_prefix//://include }" \ LINK_DIRECTORIES="${sysroot_prefix//://lib }" \ \ -- 1.7.8.3 -- _____________________________________________________________ R-S-I Elektrotechnik GmbH & Co. KG Woelkestrasse 11 D-85301 Schweitenkirchen Fon: +49 8444 9204-0 Fax: +49 8444 9204-50 www.rsi-elektrotechnik.de _____________________________________________________________ Amtsgericht Ingolstadt - GmbH: HRB 191328 - KG: HRA 170363 Gesch�ftsf�hrer: Dr.-Ing. Michael Sorg, Dipl.-Ing. Franz Sorg USt-IdNr.: DE 128592548 --===============1863759521== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline -- ptxdist mailing list ptxdist@pengutronix.de --===============1863759521==--