From: maximilian attems <maks@debian.org>
Date: Thu, 19 Jul 2018 00:13:54 +0000 (+0100)
Subject: multiarch-include-path
X-Git-Tag: archive/raspbian/2.0.4-14+rpi1^2~27
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0c5605d575bd705e5399ebe1d4ae70e193581bd8;p=klibc.git

multiarch-include-path


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');