Date: Tue, 08 Aug 2000 23:47:37 -0400
From: Ray Kelm <address@hidden>
To: Sam Lantinga <address@hidden>
Subject: cross

diff -ru2 gcc-2.95.2/Makefile.in gcc-2.95.2-rhk/Makefile.in
--- gcc-2.95.2/Makefile.in	Thu Nov  4 20:09:40 1999
+++ gcc-2.95.2-rhk/Makefile.in	Tue Aug  8 23:01:12 2000
@@ -215,10 +215,10 @@
     if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
       if [ -f $$r/$(TARGET_SUBDIR)/winsup/Makefile ] ; then \
-        echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -B$(build_tooldir)/bin/ -L$$r/$(TARGET_SUBDIR)/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
+        echo $$r/gcc/xgcc -B$$r/gcc/ -I$(build_tooldir)/include -B$$r/$(TARGET_SUBDIR)/newlib/ -B$(build_tooldir)/bin/ -L$$r/$(TARGET_SUBDIR)/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
       else \
-        echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
+        echo $$r/gcc/xgcc -B$$r/gcc/ -I$(build_tooldir)/include -B$(build_tooldir)/lib/ -B$(build_tooldir)/bin/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
       fi; \
     else \
-      echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/; \
+      echo $$r/gcc/xgcc -B$$r/gcc/ -I$(build_tooldir)/include -B$(build_tooldir)/lib/ -B$(build_tooldir)/bin/; \
     fi; \
   else \
@@ -234,9 +234,9 @@
 # build libgcc2.a.  We define it here so that it can itself be
 # overridden on the command line.
-GCC_FOR_TARGET = $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/ -I$(build_tooldir)/include
+GCC_FOR_TARGET = $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/lib/ -B$(build_tooldir)/bin/ -I$(build_tooldir)/include
 
 CHILL_FOR_TARGET = ` \
   if [ -f $$r/gcc/xgcc ] ; then \
-    echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/ -L$$r/gcc/ch/runtime/; \
+    echo $$r/gcc/xgcc -B$$r/gcc/ -I$(build_tooldir)/include -B$(build_tooldir)/bin/ -L$$r/gcc/ch/runtime/; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
@@ -251,10 +251,10 @@
     if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
       if [ -f $$r/$(TARGET_SUBDIR)/winsup/Makefile ] ; then \
-        echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -B$(build_tooldir)/bin/ -L$$r/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
+        echo $$r/gcc/xgcc -B$$r/gcc/ -I$(build_tooldir)/include -B$$r/$(TARGET_SUBDIR)/newlib/ -B$(build_tooldir)/bin/ -L$$r/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
       else \
-        echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
+        echo $$r/gcc/xgcc -B$$r/gcc/ -I$(build_tooldir)/include -B$(build_tooldir)/bin/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
       fi; \
     else \
-      echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/; \
+      echo $$r/gcc/xgcc -B$$r/gcc/ -I$(build_tooldir)/include -B$(build_tooldir)/bin/; \
     fi; \
   else \
diff -ru2 gcc-2.95.2/libio/gen-params gcc-2.95.2-rhk/libio/gen-params
--- gcc-2.95.2/libio/gen-params	Thu Nov  4 20:10:16 1999
+++ gcc-2.95.2-rhk/libio/gen-params	Tue Aug  8 21:30:04 2000
@@ -50,8 +50,8 @@
 binutilsdir=${binutilsdir-${rootdir}/binutils}
 CC=${CC-`if [ -f ${gccdir}/xgcc ] ; \
-	then echo ${gccdir}/xgcc -B${gccdir}/ ; \
+	then echo ${gccdir}/xgcc -B${gccdir}/ -specs=${gccdir}/specs ; \
 	else echo cc ; fi`}
 CXX=${CXX-`if [ -f ${gccdir}/xgcc ] ; \
-	then echo ${gccdir}/xgcc -B${gccdir}/ ; \
+	then echo ${gccdir}/xgcc -B${gccdir}/ -specs=${gccdir}/specs ; \
 	else echo gcc ; fi`}
 CPP=${CPP-`echo ${CC} -E`}