mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-19 12:57:53 +00:00
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>
This commit is contained in:
parent
f7f70b67c4
commit
51a3606b17
@ -88,7 +88,7 @@ do_libiconv_backend() {
|
||||
|
||||
CT_DoLog EXTRA "Configuring libiconv"
|
||||
|
||||
CT_DoExecLog ALL cp -aT "${CT_SRC_DIR}/libiconv-${CT_LIBICONV_VERSION}" "."
|
||||
CT_DoExecLog ALL cp -aT "${CT_SRC_DIR}/libiconv-${CT_LIBICONV_VERSION}/." "."
|
||||
|
||||
if [ "${static_build}" = "y" ]; then
|
||||
extra_config+=("--disable-shared")
|
||||
|
@ -88,7 +88,7 @@ do_gettext_backend() {
|
||||
|
||||
CT_DoLog EXTRA "Configuring gettext"
|
||||
|
||||
CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/gettext-${CT_GETTEXT_VERSION}/"/* .
|
||||
CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/gettext-${CT_GETTEXT_VERSION}/." .
|
||||
|
||||
# A bit ugly. D__USE_MINGW_ANSI_STDIO=1 has its own {v}asprintf functions
|
||||
# but gettext configure doesn't see this flag when it checks for that. An
|
||||
|
@ -24,7 +24,7 @@ do_debug_duma_extract() {
|
||||
do_debug_duma_build() {
|
||||
CT_DoStep INFO "Installing D.U.M.A."
|
||||
CT_DoLog EXTRA "Copying sources"
|
||||
cp -a "${CT_SRC_DIR}/duma_${CT_DUMA_VERSION}" "${CT_BUILD_DIR}/build-duma"
|
||||
cp -a "${CT_SRC_DIR}/duma_${CT_DUMA_VERSION}/." "${CT_BUILD_DIR}/build-duma"
|
||||
CT_Pushd "${CT_BUILD_DIR}/build-duma"
|
||||
|
||||
DUMA_CPP=
|
||||
|
@ -22,7 +22,7 @@ do_debug_ltrace_build() {
|
||||
CT_DoStep INFO "Installing ltrace"
|
||||
|
||||
CT_DoLog EXTRA "Copying sources to build dir"
|
||||
CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/ltrace-${CT_LTRACE_VERSION}" \
|
||||
CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/ltrace-${CT_LTRACE_VERSION}/." \
|
||||
"${CT_BUILD_DIR}/build-ltrace"
|
||||
CT_Pushd "${CT_BUILD_DIR}/build-ltrace"
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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}"
|
||||
|
Loading…
Reference in New Issue
Block a user