diff options
| author | Wang Deqiang <wang.deqiang@linaro.org> | 2014-12-09 13:27:09 -0700 |
|---|---|---|
| committer | Rob Savoye <rob.savoye@linaro.org> | 2014-12-09 13:27:09 -0700 |
| commit | a55f934aa350eec2f10f0697321a5aa22ab01661 (patch) | |
| tree | 651c4f9b6d6156ce23464e411331f7177e53fc93 | |
| parent | 2bd163153717afb940cdd7f63f781cd0933b220b (diff) | |
create an empty ld.so.cache file
| -rwxr-xr-x | lib/make.sh | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/make.sh b/lib/make.sh index 69ffc14..2e0e1db 100755 --- a/lib/make.sh +++ b/lib/make.sh @@ -27,7 +27,7 @@ build_all() # Specify the components, in order to get a full toolchain build if test x"${target}" != x"${build}"; then local builds="infrastructure binutils stage1 libc stage2 gdb" - if test "`echo ${target} | grep -c -- -none-`" -eq 0; then + if test "`echo ${target} | grep -c -- -linux-`" -eq 1; then local builds="${builds} gdbserver" fi notice "Buildall: Building \"${builds}\" for cross target ${target}." @@ -409,7 +409,7 @@ make_all() local default_makeflags="`read_config $1 default_makeflags`" if test x"${tool}" = x"gdb" -a x"$2" == x"gdbserver"; then - default_makeflags="gdbserver CFLAGS=--sysroot=${local_builds}/sysroot-${target}" + default_makeflags="gdbserver CFLAGS=--sysroot=${sysroots}" fi if test x"${default_makeflags}" != x; then @@ -703,7 +703,7 @@ make_check() local checklog="${builddir}/check-${tool}.log" if test x"${build}" = x"${target}" -a x"${tarbin}" != x"yes"; then - dryrun "make check RUNTESTFLAGS=\"${runtest_flags}\" ${make_flags} -w -i -k -C ${builddir} 2>&1 | tee ${checklog}" + dryrun "make check RUNTESTFLAGS=\"${runtest_flags} --xml=${tool}.xml \" ${make_flags} -w -i -k -C ${builddir} 2>&1 | tee ${checklog}" else case ${tool} in binutils) @@ -723,10 +723,18 @@ make_check() local check_targets="check" ;; esac + if test x"${tool}" = x"gcc"; then + touch ${sysroots}/etc/ld.so.cache + chmod 700 ${sysroots}/etc/ld.so.cache + fi for i in ${dirs}; do dryrun "make ${check_targets} SYSROOT_UNDER_TEST=${sysroots} PREFIX_UNDER_TEST=\"${local_builds}/destdir/${host}/bin/${target}-\" RUNTESTFLAGS=\"${runtest_flags}\" ${make_flags} -w -i -k -C ${builddir}$i 2>&1 | tee ${checklog}" done + + if test x"${tool}" = x"gcc"; then + rm -rf ${sysroots}/etc/ld.so.cache + fi fi return 0 |