diff options
| -rw-r--r-- | config/companion_libs/cloog.in | 3 | ||||
| -rw-r--r-- | config/companion_libs/isl.in | 5 | ||||
| -rw-r--r-- | scripts/build/libc/uClibc.sh | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in index f094fa3..95b283c 100644 --- a/config/companion_libs/cloog.in +++ b/config/companion_libs/cloog.in @@ -12,9 +12,8 @@ choice config CLOOG_V_0_18_4 bool - prompt "0.18.4 (OBSOLETE)" + prompt "0.18.4" depends on ISL_V_0_12_or_later - depends on OBSOLETE select CLOOG_0_18_4_or_later config CLOOG_V_0_18_1 diff --git a/config/companion_libs/isl.in b/config/companion_libs/isl.in index 6ba9e07..bb2766f 100644 --- a/config/companion_libs/isl.in +++ b/config/companion_libs/isl.in @@ -39,10 +39,9 @@ config ISL_V_0_16_1 # mainline 4.9 release (4.9.4) does. config ISL_V_0_15 bool - prompt "0.15 (OBSOLETE)" - depends on CC_GCC_4_9_or_later && !CC_GCC_V_linaro_4_9 + prompt "0.15" + depends on CC_GCC_4_9_or_later select ISL_V_0_15_or_later - depends on OBSOLETE config ISL_V_0_14 bool diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index e87abaf..fcabee8 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -80,8 +80,6 @@ do_libc_backend() { CT_mkdir_pushd "${CT_BUILD_DIR}/build-libc-${libc_mode}" CT_IterateMultilibs do_libc_backend_once multilib libc_mode="${libc_mode}" - - CT_Popd CT_EndStep } @@ -104,7 +102,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 -av "${CT_SRC_DIR}/${uclibc_name}-${CT_LIBC_VERSION}/." . multilib_dir="lib/${multi_os_dir}" startfiles_dir="${multi_root}/usr/${multilib_dir}" |