diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-07-18 17:31:28 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2017-07-18 17:31:28 (GMT) |
| commit | 3182001a272960e6a23ea53c7fade57eb41f7dd7 (patch) | |
| tree | 49c1e5b9f93569f383f9a8659202a52bf02cf1bf | |
| parent | bd11c0e91189208db07a9851708091fb951f823f (diff) | |
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>
| -rw-r--r-- | samples/sparc-leon-linux-uclibc/crosstool.config | 4 | ||||
| -rw-r--r-- | scripts/saveSample.sh.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/samples/sparc-leon-linux-uclibc/crosstool.config b/samples/sparc-leon-linux-uclibc/crosstool.config index 26d3cbd..20612d8 100644 --- a/samples/sparc-leon-linux-uclibc/crosstool.config +++ b/samples/sparc-leon-linux-uclibc/crosstool.config @@ -6,9 +6,9 @@ CT_TARGET_VENDOR="leon" CT_KERNEL_LINUX=y CT_LINUX_V_3_10=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_GCC_V_6_3_0=y +CT_GCC_V_6_4_0=y CT_CC_GCC_EXTRA_CONFIG_ARRAY="--disable-libitm" CT_CC_LANG_CXX=y CT_DEBUG_GDB=y diff --git a/scripts/saveSample.sh.in b/scripts/saveSample.sh.in index 2c666db..5fab6d9 100644 --- a/scripts/saveSample.sh.in +++ b/scripts/saveSample.sh.in @@ -72,8 +72,8 @@ fi # Save the uClibc .config file if [ -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then # 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" - "${sed}" -r -i -e 's|^(CT_LIBC_UCLIBC_CONFIG_FILE)=.+$|\1="'"${samp_top_dir}"'/samples/${CT_TARGET}/${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}.config"|;' \ .defconfig else # remove any dangling files |