From 51a3606b17b62eb5a9ae5616467f8814792969b7 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 2 Dec 2016 14:50:58 -0800 Subject: Fix use of custom location if it is a directory. In that case, CT_GetCustom just creates a symlink to the original. In that case, 'cp -a .' gives an error and 'cp -a ' creates as a symlink (which will then run the build inside the shared directory, .build/src/). Signed-off-by: Alexey Neyman --- scripts/build/libc/avr-libc.sh | 2 +- scripts/build/libc/uClibc.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/build/libc') diff --git a/scripts/build/libc/avr-libc.sh b/scripts/build/libc/avr-libc.sh index ff16cf9a..431e8768 100644 --- a/scripts/build/libc/avr-libc.sh +++ b/scripts/build/libc/avr-libc.sh @@ -41,7 +41,7 @@ do_libc_post_cc() { CT_DoStep INFO "Installing C library" CT_DoLog EXTRA "Copying sources to build directory" - CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/avr-libc-${CT_LIBC_VERSION}" \ + CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/avr-libc-${CT_LIBC_VERSION}/." \ "${CT_BUILD_DIR}/build-libc-post-cc" cd "${CT_BUILD_DIR}/build-libc-post-cc" diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index 2f25e27b..96d4b517 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -104,7 +104,7 @@ do_libc_backend_once() { # Simply copy files until uClibc has the ability to build out-of-tree CT_DoLog EXTRA "Copying sources to build dir" - CT_DoExecLog ALL cp -aT "${CT_SRC_DIR}/${uclibc_name}-${CT_LIBC_VERSION}" . + CT_DoExecLog ALL cp -aT "${CT_SRC_DIR}/${uclibc_name}-${CT_LIBC_VERSION}/." . multilib_dir="lib/${multi_os_dir}" startfiles_dir="${multi_root}/usr/${multilib_dir}" -- cgit v1.2.3