about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-04-05 23:40:28 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-05 23:40:28 -0400
commitdcd2ae90d5d5c9f9360def390f8ff413ee3dba57 (patch)
treeaca09509b2b230856fec709b796a2675469e0019
parent993eb0541cd32ce72f1f8d768b35857a678894eb (diff)
downloadglibc-dcd2ae90d5d5c9f9360def390f8ff413ee3dba57.tar.gz
glibc-dcd2ae90d5d5c9f9360def390f8ff413ee3dba57.tar.xz
glibc-dcd2ae90d5d5c9f9360def390f8ff413ee3dba57.zip
Fix check-local-headers.sh on multiarch systems.
	* scripts/check-local-headers.sh: Accept a host triplet in the
	path matched by the exclude regexp.
-rw-r--r--ChangeLog3
-rwxr-xr-xscripts/check-local-headers.sh2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6337288222..be9cda59f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-04-05  David S. Miller  <davem@davemloft.net>
 
+	* scripts/check-local-headers.sh: Accept a host triplet in the
+	path matched by the exclude regexp.
+
 	* elf/dynamic-link.h (_ELF_DYNAMIC_DO_RELOC): Reduce down to one
 	definition.
 	* sysdeps/powerpc/powerpc32/dl-machine.h
diff --git a/scripts/check-local-headers.sh b/scripts/check-local-headers.sh
index c7bc40bbce..08ed880c5d 100755
--- a/scripts/check-local-headers.sh
+++ b/scripts/check-local-headers.sh
@@ -28,7 +28,7 @@ exec ${AWK} -v includedir="$includedir" '
 BEGIN {
   status = 0
   exclude = "^" includedir \
-    "/(asm[-/]|linux/|selinux/|gd|nss3/|sys/capability\\.h|libaudit\\.h)"
+    "/(.*-.*-.*/|)(asm[-/]|linux/|selinux/|gd|nss3/|sys/capability\\.h|libaudit\\.h)"
 }
 /^[^ ]/ && $1 ~ /.*:/ { obj = $1 }
 {