From: Steve Langasek <steve.langasek@linaro.org>
Date: Mon, 28 Jun 2021 14:24:37 +0000 (+0100)
Subject: Include the multiarch include directory in klcc's path
X-Git-Tag: archive/raspbian/2.0.4-9+rpi1+deb9u1^2~23
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e7fba9b587d13d2f68a76b335258ae55623875c0;p=klibc.git

Include the multiarch include directory in klcc's path

The multiarch include directory, /usr/include/<triplet>, needs to be
explicitly added to klcc's path; without this, klcc is incompatible
with recent Ubuntu versions of linux-libc-dev and fails to find any asm/
headers.

This change is safe to apply on non-multiarch-enabled systems, since
$(DEB_HOST_MULTIARCH) will evaluate empty.  However, upstreaming should
probably wait until we have a way to get this path information in a
vendor-neutral manner.

Gbp-Pq: Name multiarch-include-path
---

diff --git a/klcc/Kbuild b/klcc/Kbuild
index 48c8b07..a6ea9b3 100644
--- a/klcc/Kbuild
+++ b/klcc/Kbuild
@@ -27,6 +27,7 @@ $(obj)/$(KLIBCCROSS)klibc.config: $(src)/Kbuild \
 	$(Q)echo 'bindir=$(INSTALLDIR)/$(KCROSS)bin' >> $@
 	$(Q)echo 'libdir=$(INSTALLDIR)/$(KCROSS)lib' >> $@
 	$(Q)echo 'includedir=$(INSTALLDIR)/$(KCROSS)include' >> $@
+	$(Q)echo 'multiarch_path=$(DEB_HOST_MULTIARCH)' >> $@
 
 
 # Generate klcc
diff --git a/klcc/klcc.in b/klcc/klcc.in
index 43d0984..d8a8e75 100644
--- a/klcc/klcc.in
+++ b/klcc/klcc.in
@@ -7,6 +7,10 @@ use IPC::Open3;
 	     "-I${prefix}/${KCROSS}include/bits${BITSIZE}",
 	     "-I${prefix}/${KCROSS}include");
 
+if ($multiarch_path ne '') {
+	unshift(@includes, "-I${prefix}/${KCROSS}include/${multiarch_path}");
+}
+
 # Default optimization options (for compiles without -g)
 @optopt =  @OPTFLAGS;
 @goptopt = ('-O');