From bf7ed5a795f6a9fb9cd02449c5e6d24f52907155 Mon Sep 17 00:00:00 2001 From: maximilian attems Date: Tue, 17 May 2016 23:45:58 +0000 Subject: [PATCH] multiarch-include-path Gbp-Pq: Name multiarch-include-path --- klcc/Kbuild | 1 + klcc/klcc.in | 4 ++++ 2 files changed, 5 insertions(+) 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'); -- 2.30.2