]>
Commit | Line | Data |
---|---|---|
c860c3d8 PS |
1 | --- klibc-1.0/klcc.in.orig 2005-03-07 22:44:49.000000000 +0100 |
2 | +++ klibc-1.0/klcc.in 2005-06-13 21:05:09.000000000 +0200 | |
3 | @@ -1,9 +1,9 @@ | |
4 | # -*- perl -*- | |
5 | ||
6 | # Standard includes | |
7 | -@includes = ("-I${prefix}/${KCROSS}include/arch/${ARCH}", | |
8 | - "-I${prefix}/${KCROSS}include/bits${BITSIZE}", | |
9 | - "-I${prefix}/${KCROSS}include"); | |
10 | +@includes = ("-I${includedir}/arch/${ARCH}", | |
11 | + "-I${includedir}/bits${BITSIZE}", | |
12 | + "-I${includedir}"); | |
13 | ||
14 | # Default optimization options (for compiles without -g) | |
15 | @optopt = @OPTFLAGS; | |
16 | @@ -13,10 +13,10 @@ | |
17 | @stdlibpath = ("-L${prefix}/${KCROSS}lib"); | |
18 | ||
19 | # Options and libraries to pass to ld; shared versus static | |
20 | -@staticopt = ("${prefix}/${KCROSS}lib/crt0.o"); | |
21 | -@staticlib = ("${prefix}/${KCROSS}lib/libc.a"); | |
22 | -@sharedopt = (@EMAIN, "${prefix}/${KCROSS}lib/interp.o"); | |
23 | -@sharedlib = ('-R', "${prefix}/${KCROSS}lib/libc.so"); | |
24 | +@staticopt = ("${libdir}/crt0.o"); | |
25 | +@staticlib = ("${libdir}/libc.a"); | |
26 | +@sharedopt = (@EMAIN, "${libdir}/interp.o"); | |
27 | +@sharedlib = ('-R', "${libdir}/libc.so"); | |
28 | ||
29 | # Returns the language (-x option string) for a specific extension. | |
30 | sub filename2lang($) { | |
31 | --- klibc-1.0/Makefile.orig 2005-03-07 19:17:15.000000000 +0100 | |
32 | +++ klibc-1.0/Makefile 2005-06-13 20:57:41.000000000 +0200 | |
33 | @@ -27,10 +27,10 @@ | |
34 | echo 'STRIPFLAGS=$(STRIPFLAGS)' >> $@ | |
35 | echo 'EMAIN=$(EMAIN)' >> $@ | |
36 | echo 'BITSIZE=$(BITSIZE)' >> $@ | |
37 | - echo 'prefix=$(INSTALLDIR)' >> $@ | |
38 | - echo 'bindir=$(INSTALLDIR)/$(KCROSS)bin' >> $@ | |
39 | - echo 'libdir=$(INSTALLDIR)/$(KCROSS)lib' >> $@ | |
40 | - echo 'includedir=$(INSTALLDIR)/$(KCROSS)include' >> $@ | |
41 | + echo 'prefix=$(prefix)' >> $@ | |
42 | + echo 'bindir=$(bindir)' >> $@ | |
43 | + echo 'libdir=$(libdir)' >> $@ | |
44 | + echo 'includedir=$(includedir)' >> $@ | |
45 | ||
46 | $(CROSS)klcc: klcc.in $(CROSS)klibc.config makeklcc.pl | |
47 | $(PERL) makeklcc.pl klcc.in $(CROSS)klibc.config \ |