diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-07-28 23:27:15 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-08-06 23:26:29 +0200 |
| commit | 5ebf3dcaffb0455e03d6f06f116bb416fef1bcce (patch) | |
| tree | 2dad53998c6ac83f2d0709fa13f17cc53f3f3f93 | |
| parent | 5bc73a7b721bd51f00834ba01f89de71c3c0382c (diff) | |
| download | ptxdist-5ebf3dcaffb0455e03d6f06f116bb416fef1bcce.tar.gz ptxdist-5ebf3dcaffb0455e03d6f06f116bb416fef1bcce.tar.xz | |
[ptxd_make_cmake_toolchain] use PTXDIST_PATH_SYSROOT_ALL
instead of just supporting sysroot_target and sysroot_toolchain
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | config/cmake/toolchain.cmake.in | 2 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_cmake_toolchain.sh | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/config/cmake/toolchain.cmake.in b/config/cmake/toolchain.cmake.in index ec3831e30..1188bedb1 100644 --- a/config/cmake/toolchain.cmake.in +++ b/config/cmake/toolchain.cmake.in @@ -11,7 +11,7 @@ SET(CMAKE_C_COMPILER @CC@) SET(CMAKE_CXX_COMPILER @CXX@) # where is the target environment -SET(CMAKE_FIND_ROOT_PATH @SYSROOT_TOOLCHAIN@ @SYSROOT_TARGET@) +SET(CMAKE_FIND_ROOT_PATH @SYSROOT@) # search for programs in the build host directories SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) diff --git a/scripts/lib/ptxd_make_cmake_toolchain.sh b/scripts/lib/ptxd_make_cmake_toolchain.sh index f5e52c1c3..60e8b69e1 100644 --- a/scripts/lib/ptxd_make_cmake_toolchain.sh +++ b/scripts/lib/ptxd_make_cmake_toolchain.sh @@ -6,7 +6,7 @@ export PTXDIST_CMAKE_TOOLCHAIN # # generate cmake toolchain file from template # -# stdout: cmake toolchain file +# $1: cmake toolchain file # # FIXME: take care about non linux # @@ -17,8 +17,7 @@ ptxd_make_cmake_toolchain() { CC="$(which "${CC}")" \ CXX="$(which "${CXX}")" \ \ - SYSROOT_TOOLCHAIN="${PTXDIST_SYSROOT_TOOLCHAIN}" \ - SYSROOT_TARGET="${SYSROOT}" \ + SYSROOT="${PTXDIST_PATH_SYSROOT_ALL//:/ }" \ \ ptxd_replace_magic "${PTXDIST_TOPDIR}/config/cmake/toolchain.cmake.in" > "${1}" } |