[Glibc-bsd-commits] r5860 - in trunk/kfreebsd-kernel-headers: debian test

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2015-12-15 02:30:17 +0000 (Tue, 15 Dec 2015)
New Revision: 5860

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/test/Makefile
Log:
Fix test/Makefile to look in multiarch include dirs


Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2015-12-08 19:30:38 UTC (rev 5859)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2015-12-15 02:30:17 UTC (rev 5860)
@@ -2,6 +2,7 @@
 
   * Fix typos in debian/rules introduced since 10.1~5.
     (Thanks, Helmut Grohne).
+  * Fix test/Makefile to look in multiarch include dirs
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Tue, 06 Oct 2015 17:25:46 +0100
 

Modified: trunk/kfreebsd-kernel-headers/test/Makefile
===================================================================
--- trunk/kfreebsd-kernel-headers/test/Makefile	2015-12-08 19:30:38 UTC (rev 5859)
+++ trunk/kfreebsd-kernel-headers/test/Makefile	2015-12-15 02:30:17 UTC (rev 5860)
@@ -1,3 +1,5 @@
+DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 TESTS = \
 	assert_correct_bsize.o \
 	assert_wchar_size.o \
@@ -38,7 +40,7 @@
 
 #	elf.o
 
-CFLAGS = -I. -I../debian/kfreebsd-kernel-headers/usr/include
+CFLAGS = -I. -I../debian/kfreebsd-kernel-headers/usr/include/$(DEB_HOST_MULTIARCH)
 
 # Enable all the stuff in glibc to probe for collisions
 CFLAGS += -D_GNU_SOURCE -Werror -Wsystem-headers -Wimplicit-function-declaration