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.

diff --git a/ChangeLog b/ChangeLog
index 6337288222a10b64fdab273fd71193bac6423c79..be9cda59f48fc0cc75e35cadab088bacb3979440 100644 (file)
--- 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 c7bc40bbce2d256034383939d4d1d660b2daa073..08ed880c5dc6007244d34ea96dfd87df0d4a30d2 100755 (executable)
--- 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 }
 {