diff options
| author | Aurelien Jarno <aurel32@debian.org> | 2011-12-31 01:20:10 +0100 |
|---|---|---|
| committer | maximilian attems <max@stro.at> | 2012-02-23 21:35:39 +0100 |
| commit | bdbd474c74996eb07999bbf87e6e334cec248ee1 (patch) | |
| tree | 289d3c6f935d74e88a57477f781b4ddc4eb75fd1 | |
| parent | dfd907cb0abeef2b0f99d1daefbde4b01f44a5ab (diff) | |
| download | klibc-bdbd474c74996eb07999bbf87e6e334cec248ee1.tar.gz | |
[klibc] s390x: klcc searches for include in the wrong path
s390 and s390x are sharing the same include files, in
/usr/lib/klibc/include/arch/s390. However klcc seatches for the s390x
includes in /usr/lib/klibc/include/arch/s390x, which doesn't exist.
The patch below fixes the issue by using the ARCHDIR variable instead
of the ARCH one in klcc. It's one possible fix, another possible fix
would be to use a symlink, or to split s390 and s390x in two different
architectures as anyway they don't share so much code.
Signed-off-by: maximilian attems <max@stro.at>
| -rw-r--r-- | klcc/Kbuild | 1 | ||||
| -rw-r--r-- | klcc/klcc.in | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/klcc/Kbuild b/klcc/Kbuild index b71581b450ceb..48c8b07bba98a 100644 --- a/klcc/Kbuild +++ b/klcc/Kbuild @@ -10,6 +10,7 @@ $(obj)/$(KLIBCCROSS)klibc.config: $(src)/Kbuild \ @echo " GEN $@" $(Q)rm -f $@ $(Q)echo 'ARCH=$(KLIBCARCH)' >> $@ + $(Q)echo 'ARCHDIR=$(KLIBCARCHDIR)' >> $@ $(Q)echo 'CROSS=$(KLIBCROSS)' >> $@ $(Q)echo 'KCROSS=$(KCROSS)' >> $@ $(Q)echo 'CC=$(KLIBCCC)' >> $@ diff --git a/klcc/klcc.in b/klcc/klcc.in index a6f1523000621..242fb1600b0b0 100644 --- a/klcc/klcc.in +++ b/klcc/klcc.in @@ -3,7 +3,7 @@ use IPC::Open3; # Standard includes -@includes = ("-I${prefix}/${KCROSS}include/arch/${ARCH}", +@includes = ("-I${prefix}/${KCROSS}include/arch/${ARCHDIR}", "-I${prefix}/${KCROSS}include/bits${BITSIZE}", "-I${prefix}/${KCROSS}include"); |