# HG changeset patch # User "Yann E. MORIN" # Date 1362345880 -3600 # Node ID cbaf37cc20b7acb900e503020210359ff42e2189 # Parent 23099a88a139a857aaccec2f0cdbf41cac9131e0 libc/glibc: do not overwrite existing bits/syscall.h Signed-off-by: "Yann E. MORIN" Cc: Rafael C Cc: Jérôme BARDON Cc: Daniel Price diff -r 23099a88a139 -r cbaf37cc20b7 scripts/build/libc/glibc-eglibc.sh-common --- a/scripts/build/libc/glibc-eglibc.sh-common Sun Mar 03 22:18:35 2013 +0100 +++ b/scripts/build/libc/glibc-eglibc.sh-common Sun Mar 03 22:24:40 2013 +0100 @@ -402,9 +402,12 @@ # error: bits/syscall.h: No such file or directory # solved by following copy; see http://sourceware.org/ml/crossgcc/2005-05/msg00168.html # but it breaks arm, see http://sourceware.org/ml/crossgcc/2006-01/msg00091.html + # Of course, only copy it if it does not already exist case "${CT_ARCH}" in arm) ;; - *) if [ -f "misc/bits/syscall.h" ]; then + *) if [ -f "${CT_HEADERS_DIR}/bits/syscall.h" ]; then + CT_DoLog ALL "Not over-writing existing bits/syscall.h" + elif [ -f "misc/bits/syscall.h" ]; then CT_DoExecLog ALL cp -v "misc/bits/syscall.h" \ "${CT_HEADERS_DIR}/bits/syscall.h" else