diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-02-05 16:05:05 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-02-05 18:54:14 +0100 |
| commit | bfc01b940a88c1d6d5d47cd0722ccfea5a4357bc (patch) | |
| tree | ba8f686efa8178e5f7d50af740e287cc04e1539d /bin | |
| parent | 5d2ac28b24b66386b81be26db225326fdaf2d48a (diff) | |
| download | ptxdist-bfc01b940a88c1d6d5d47cd0722ccfea5a4357bc.tar.gz ptxdist-bfc01b940a88c1d6d5d47cd0722ccfea5a4357bc.tar.xz | |
ptxdist: remove PTX_CCACHE_DIR
...we now call ccache directly from the host wrapper.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ptxdist | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index 2c6f66aa5..579cedbbd 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -509,12 +509,6 @@ check_dirs() { fi done - # create dir for ccache links - if [ -n "${PTX_CCACHE_DIR}" ]; then - rm -rf -- "${PTX_CCACHE_DIR}" && - mkdir -p -- "${PTX_CCACHE_DIR}" || ptxd_bailout "cannot create dir: '${PTX_CCACHE_DIR}'" - fi - rm -rf -- "${PTX_WRAPPER_DIR}" && mkdir -p -- "${PTX_WRAPPER_DIR}" || ptxd_bailout "cannot create dir: '${PTX_WRAPPER_DIR}'" @@ -602,10 +596,6 @@ check_compiler() { ln -sf "${cc_default}.real" "${PTX_WRAPPER_DIR}/${cc_alternate}.real" fi || \ ptxd_bailout "unable to create compiler wrapper link" - - if [ -n "${PTX_CCACHE_DIR}" ]; then - ln -sf "$(which "ccache")" "${PTX_CCACHE_DIR}/${!cc}" || ptxd_bailout "unable to create ccache link" - fi done ptxd_get_ptxconf PTXCONF_BUILD_TOOLCHAIN >/dev/null && return || true @@ -2305,7 +2295,7 @@ setup_libs() { # # add PTXDIST_TOOLCHAIN and sysroots to path # -# out: PATH, PTX_CCACHE_DIR +# out: PATH # setup_path() { # save PATH and reuse it later on @@ -2324,10 +2314,7 @@ setup_path() { if [ -n "${PTXCONF_SETUP_CCACHE}" ]; then PTXDIST_CCACHE="$(which ccache 2>/dev/null)" - if [ -n "${PTXDIST_CCACHE}" ]; then - PTX_CCACHE_DIR="${sysroot_host}/lib/ccache" - PATH="${PTX_CCACHE_DIR}:${PATH}" - else + if [ -z "${PTXDIST_CCACHE}" ]; then echo echo "${PTXDIST_LOG_PROMPT}warning: ccache has been activated, but was not found on your system" echo "${PTXDIST_LOG_PROMPT}warning: install ccache, disable it ('ptxdist setup' -> 'Developer Options' menu)" |