diff options
| author |   Alexey Neyman <stilor@att.net> | 2016-12-02 22:50:58 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2016-12-02 23:02:58 (GMT) |
| commit | 51a3606b17b62eb5a9ae5616467f8814792969b7 (patch) | |
| tree | 21a80ffd8ec99c981c3949a6da73b0d192bd0412 /scripts/build/libc | |
| parent | f7f70b67c44727d9eea48997c837e87c5e63ca33 (diff) | |
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 <path> .' gives an error and 'cp -a <path> <newdir>'
creates <newdir> as a symlink (which will then run the build inside
the shared directory, .build/src/<package>).
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'scripts/build/libc')
| -rw-r--r-- | scripts/build/libc/avr-libc.sh | 2 | ||||
| -rw-r--r-- | scripts/build/libc/uClibc.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build/libc/avr-libc.sh b/scripts/build/libc/avr-libc.sh index ff16cf9..431e876 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 2f25e27..96d4b51 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}" |