diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/test_suite/gcc.sh | 26 | ||||
| -rw-r--r-- | scripts/crosstool-NG.sh.in | 2 |
2 files changed, 11 insertions, 17 deletions
diff --git a/scripts/build/test_suite/gcc.sh b/scripts/build/test_suite/gcc.sh index 1b65269..c2493c0 100644 --- a/scripts/build/test_suite/gcc.sh +++ b/scripts/build/test_suite/gcc.sh @@ -14,22 +14,16 @@ do_test_suite_gcc_build() { CT_DoStep INFO "Installing GCC test suite" - CT_DoExecLog ALL mkdir -p "${CT_TEST_SUITE_DIR}/gcc-test-suite/gcc-${CT_CC_VERSION}/gcc" - CT_DoExecLog ALL cp "${CT_TOP_DIR}/contrib/gcc-test-suite/Makefile" \ - "${CT_TEST_SUITE_DIR}/gcc-test-suite" - CT_DoExecLog ALL cp "${CT_TOP_DIR}/contrib/gcc-test-suite/default.cfg" \ - "${CT_TEST_SUITE_DIR}/gcc-test-suite" - CT_DoExecLog ALL cp "${CT_TOP_DIR}/contrib/gcc-test-suite/README" \ - "${CT_TEST_SUITE_DIR}/gcc-test-suite" - CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/testsuite" \ - "${CT_TEST_SUITE_DIR}/gcc-test-suite/gcc-${CT_CC_VERSION}/gcc" - sed "s/DG_GCC_VERSION .*/DG_GCC_VERSION = ${CT_CC_VERSION}/g" \ - ${CT_TEST_SUITE_DIR}/gcc-test-suite/default.cfg > \ - ${CT_TEST_SUITE_DIR}/gcc-test-suite/default.cfg.tmp - sed "s/DG_TARGET .*/DG_TARGET = ${CT_TARGET}/g" \ - ${CT_TEST_SUITE_DIR}/gcc-test-suite/default.cfg.tmp > \ - ${CT_TEST_SUITE_DIR}/gcc-test-suite/default.cfg - CT_DoExecLog ALL rm -f "${CT_TEST_SUITE_DIR}/gcc-test-suite/default.cfg.tmp" + CT_DoExecLog ALL mkdir -p "${CT_TEST_SUITE_DIR}/gcc" + CT_DoExecLog ALL cp -a "${CT_LIB_DIR}/contrib/gcc-test-suite/default.cfg" \ + "${CT_LIB_DIR}/contrib/gcc-test-suite/Makefile" \ + "${CT_LIB_DIR}/contrib/gcc-test-suite/README" \ + "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/testsuite" \ + "${CT_TEST_SUITE_DIR}/gcc" + + CT_DoExecLog ALL sed -i -r -e "s/@@DG_TARGET@@/${CT_TARGET}/g;" \ + "${CT_TEST_SUITE_DIR}/gcc/Makefile" + CT_EndStep } diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index 29ae4a1..45386de 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -602,6 +602,6 @@ exec >/dev/null 2>&1 [ "${CT_LOG_FILE_COMPRESS}" = y ] && bzip2 -9 "${CT_LOG_FILE}" [ "${CT_INSTALL_DIR_RO}" = "y" ] && chmod -R a-w "${CT_INSTALL_DIR}" -[ "${CT_TEST_SUITE}" = "y" ] && chmod -R a+w "${CT_TEST_SUITE_DIR}" +[ "${CT_TEST_SUITE}" = "y" ] && chmod -R u+w "${CT_TEST_SUITE_DIR}" trap - EXIT |