diff options
| -rw-r--r-- | config/cmake/toolchain-target.cmake.in (renamed from config/cmake/toolchain.cmake.in) | 2 | ||||
| -rw-r--r-- | rules/host-cmake.make | 3 | ||||
| -rw-r--r-- | rules/post/ptxd_make_cmake_toolchain.make | 5 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_cmake_toolchain.sh | 18 |
4 files changed, 19 insertions, 9 deletions
diff --git a/config/cmake/toolchain.cmake.in b/config/cmake/toolchain-target.cmake.in index 1188bedb1..dfa8b4a8d 100644 --- a/config/cmake/toolchain.cmake.in +++ b/config/cmake/toolchain-target.cmake.in @@ -3,7 +3,7 @@ # this one is important SET(CMAKE_SYSTEM_NAME @SYSTEM_NAME@) -#this one not so much +# this one not so much SET(CMAKE_SYSTEM_VERSION @SYSTEM_VERSION@) # specify the cross compiler diff --git a/rules/host-cmake.make b/rules/host-cmake.make index 1494dd0ed..57a9db9ae 100644 --- a/rules/host-cmake.make +++ b/rules/host-cmake.make @@ -45,6 +45,7 @@ HOST_CMAKE_BUILD_OOT := YES # HOST_CMAKE_AUTOCONF := $(HOST_AUTOCONF) -$(STATEDIR)/host-cmake.install.post: $(PTXDIST_CMAKE_TOOLCHAIN) +$(STATEDIR)/host-cmake.install.post: \ + $(PTXDIST_CMAKE_TOOLCHAIN_TARGET) # vim: syntax=make diff --git a/rules/post/ptxd_make_cmake_toolchain.make b/rules/post/ptxd_make_cmake_toolchain.make index ee2b02b9c..9b904167d 100644 --- a/rules/post/ptxd_make_cmake_toolchain.make +++ b/rules/post/ptxd_make_cmake_toolchain.make @@ -8,7 +8,8 @@ # see the README file. # -$(PTXDIST_CMAKE_TOOLCHAIN): - @$(CROSS_ENV) ptxd_make_cmake_toolchain "${@}" +$(PTXDIST_CMAKE_TOOLCHAIN_TARGET): + @$(CROSS_ENV) \ + ptxd_make_cmake_toolchain_target "${@}" # vim: syntax=make diff --git a/scripts/lib/ptxd_make_cmake_toolchain.sh b/scripts/lib/ptxd_make_cmake_toolchain.sh index 60e8b69e1..a11c6dc92 100644 --- a/scripts/lib/ptxd_make_cmake_toolchain.sh +++ b/scripts/lib/ptxd_make_cmake_toolchain.sh @@ -1,7 +1,15 @@ #!/bin/bash +# +# Copyright (C) 2009, 2010 by Marc Kleine-Budde <mkl@pengutronix.de> +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# -PTXDIST_CMAKE_TOOLCHAIN="${PTXDIST_GEN_CONFIG_DIR}/toolchain.cmake" -export PTXDIST_CMAKE_TOOLCHAIN +PTXDIST_CMAKE_TOOLCHAIN_TARGET="${PTXDIST_GEN_CONFIG_DIR}/toolchain-target.cmake" +export PTXDIST_CMAKE_TOOLCHAIN_TARGET # # generate cmake toolchain file from template @@ -10,7 +18,7 @@ export PTXDIST_CMAKE_TOOLCHAIN # # FIXME: take care about non linux # -ptxd_make_cmake_toolchain() { +ptxd_make_cmake_toolchain_target() { SYSTEM_NAME="Linux" \ SYSTEM_VERSION="1" \ \ @@ -19,6 +27,6 @@ ptxd_make_cmake_toolchain() { \ SYSROOT="${PTXDIST_PATH_SYSROOT_ALL//:/ }" \ \ - ptxd_replace_magic "${PTXDIST_TOPDIR}/config/cmake/toolchain.cmake.in" > "${1}" + ptxd_replace_magic "${PTXDIST_TOPDIR}/config/cmake/toolchain-target.cmake.in" > "${1}" } -export -f ptxd_make_cmake_toolchain +export -f ptxd_make_cmake_toolchain_target |