Pin sparc-leon to GCC6, again

Also, change the name for uClibc config to be version-agnostic,
the version changes too fast.

Signed-off-by: Alexey Neyman <stilor@att.net>
This commit is contained in:
Alexey Neyman 2017-07-18 10:31:28 -07:00
parent bd11c0e911
commit 3182001a27
2 changed files with 4 additions and 4 deletions

View File

@ -6,9 +6,9 @@ CT_TARGET_VENDOR="leon"
CT_KERNEL_LINUX=y CT_KERNEL_LINUX=y
CT_LINUX_V_3_10=y CT_LINUX_V_3_10=y
CT_LIBC_UCLIBC=y CT_LIBC_UCLIBC=y
CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/uClibc.config" CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}.config"
CT_LIBC_UCLIBC_IPV6=y CT_LIBC_UCLIBC_IPV6=y
CT_GCC_V_6_3_0=y CT_GCC_V_6_4_0=y
CT_CC_GCC_EXTRA_CONFIG_ARRAY="--disable-libitm" CT_CC_GCC_EXTRA_CONFIG_ARRAY="--disable-libitm"
CT_CC_LANG_CXX=y CT_CC_LANG_CXX=y
CT_DEBUG_GDB=y CT_DEBUG_GDB=y

View File

@ -72,8 +72,8 @@ fi
# Save the uClibc .config file # Save the uClibc .config file
if [ -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then if [ -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then
# We save the file, and then point the saved sample to this file # We save the file, and then point the saved sample to this file
CT_DoAddFileToSample "${CT_LIBC_UCLIBC_CONFIG_FILE}" "${samp_dir}/${CT_LIBC}-${CT_UCLIBC_NG_VERSION}.config" CT_DoAddFileToSample "${CT_LIBC_UCLIBC_CONFIG_FILE}" "${samp_dir}/${CT_LIBC}.config"
"${sed}" -r -i -e 's|^(CT_LIBC_UCLIBC_CONFIG_FILE)=.+$|\1="'"${samp_top_dir}"'/samples/${CT_TARGET}/${CT_LIBC}-${CT_UCLIBC_NG_VERSION}.config"|;' \ "${sed}" -r -i -e 's|^(CT_LIBC_UCLIBC_CONFIG_FILE)=.+$|\1="'"${samp_top_dir}"'/samples/${CT_TARGET}/${CT_LIBC}.config"|;' \
.defconfig .defconfig
else else
# remove any dangling files # remove any dangling files