projects / packages / klibc.git / blame
| 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 | |
| 7eb616bb | 3 | @@ -1,22 +1,22 @@ |
| c860c3d8 PS |
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; | |
| 7eb616bb PS |
16 | @goptopt = ('-O'); |
| 17 | ||
| 18 | # Standard library directories | |
| 19 | -@stdlibpath = ("-L${prefix}/${KCROSS}lib"); | |
| 20 | +@stdlibpath = ("-L${libdir}"); | |
| c860c3d8 PS |
21 | |
| 22 | # Options and libraries to pass to ld; shared versus static | |
| 23 | -@staticopt = ("${prefix}/${KCROSS}lib/crt0.o"); | |
| 24 | -@staticlib = ("${prefix}/${KCROSS}lib/libc.a"); | |
| 25 | -@sharedopt = (@EMAIN, "${prefix}/${KCROSS}lib/interp.o"); | |
| 26 | -@sharedlib = ('-R', "${prefix}/${KCROSS}lib/libc.so"); | |
| 7eb616bb PS |
27 | +@staticopt = ("${libdir}/klibc/crt0.o"); |
| 28 | +@staticlib = ("${libdir}/klibc/libc.a"); | |
| 29 | +@sharedopt = (@EMAIN, "${libdir}/klibc/interp.o"); | |
| 30 | +@sharedlib = ('-R', "${libdir}/klibc/libc.so"); | |
| c860c3d8 PS |
31 | |
| 32 | # Returns the language (-x option string) for a specific extension. | |
| 33 | sub filename2lang($) { | |
| 7eb616bb PS |
34 | @@ -164,6 +164,7 @@ |
| 35 | } elsif ( $a eq '-shared' ) { | |
| 36 | $shared = 1; | |
| 37 | } elsif ( $a eq '-static' ) { | |
| 38 | + push(@ldopt, $a); | |
| 39 | $shared = 0; | |
| 40 | } elsif ( $a eq '-s' ) { | |
| 41 | $strip = 1; | |
| c860c3d8 PS |
42 | --- klibc-1.0/Makefile.orig 2005-03-07 19:17:15.000000000 +0100 |
| 43 | +++ klibc-1.0/Makefile 2005-06-13 20:57:41.000000000 +0200 | |
| 44 | @@ -27,10 +27,10 @@ | |
| 45 | echo 'STRIPFLAGS=$(STRIPFLAGS)' >> $@ | |
| 46 | echo 'EMAIN=$(EMAIN)' >> $@ | |
| 47 | echo 'BITSIZE=$(BITSIZE)' >> $@ | |
| 48 | - echo 'prefix=$(INSTALLDIR)' >> $@ | |
| 49 | - echo 'bindir=$(INSTALLDIR)/$(KCROSS)bin' >> $@ | |
| 50 | - echo 'libdir=$(INSTALLDIR)/$(KCROSS)lib' >> $@ | |
| 51 | - echo 'includedir=$(INSTALLDIR)/$(KCROSS)include' >> $@ | |
| 52 | + echo 'prefix=$(prefix)' >> $@ | |
| 53 | + echo 'bindir=$(bindir)' >> $@ | |
| 54 | + echo 'libdir=$(libdir)' >> $@ | |
| 55 | + echo 'includedir=$(includedir)' >> $@ | |
| 56 | ||
| 57 | $(CROSS)klcc: klcc.in $(CROSS)klibc.config makeklcc.pl | |
| 58 | $(PERL) makeklcc.pl klcc.in $(CROSS)klibc.config \ |