klibc-klcc.patch

   1 --- klibc-1.0/klcc/klcc.in.orig 2005-03-07 22:44:49.000000000 +0100
   2 +++ klibc-1.0/klcc/klcc.in      2005-06-13 21:05:09.000000000 +0200
   3 @@ -3,22 +3,22 @@
   4  use IPC::Open3;
   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  @goptopt = ('-O');
  17
  18  # Standard library directories
  19 -@stdlibpath = ("-L${prefix}/${KCROSS}lib");
  20 +@stdlibpath = ("-L${libdir}");
  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");
  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");
  31
  32  # Returns the language (-x option string) for a specific extension.
  33  sub filename2lang($) {
  34 @@ -113,7 +113,7 @@
  35
  36  $save_temps = 0;               # The -save-temps option
  37  $verbose = 0;                  # The -v option
  38 -$shared = 0;                   # Are we compiling shared?
  39 +$shared = 1;                   # Are we compiling shared?
  40  $debugging = 0;                        # -g or -p option present?
  41  $strip = 0;                    # -s option present?
  42  undef $output;                 # -o option present?
  43 @@ -175,6 +175,7 @@
  44      } elsif ( $a eq '-shared' ) {
  45         $shared = 1;
  46      } elsif ( $a eq '-static' ) {
  47 +       push(@ldopt, $a);
  48         $shared = 0;
  49      } elsif ( $a eq '-s' ) {
  50         $strip = 1;