From d12f807b164f4cd85d1a5ff20154911f2bf6bb27 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@free.fr>
Date: Sun, 3 Mar 2013 22:24:40 +0100
Subject: libc/glibc: do not overwrite existing bits/syscall.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Rafael C <groups.r2@gmail.com>
Cc: Jérôme BARDON <bardon.pro@gmail.com>
Cc: Daniel Price <daniel.price@gmail.com>

diff --git a/scripts/build/libc/glibc-eglibc.sh-common b/scripts/build/libc/glibc-eglibc.sh-common
index 365767e..c01e671 100644
--- a/scripts/build/libc/glibc-eglibc.sh-common
+++ b/scripts/build/libc/glibc-eglibc.sh-common
@@ -402,9 +402,12 @@ do_libc_backend_once() {
             #  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
-- 
cgit v0.10.2-6-g49f6