upstream/gcc-3.3/patches/ranlib.patch

   1 --- gcc/Makefile.in     Tue Apr 22 08:50:48 2003
   2 +++ gcc/Makefile.in     Sun Sep  7 20:51:05 2003
   3 @@ -2915,11 +2915,7 @@
   4
   5  # Install the library.
   6  install-libgcc: libgcc.mk libgcc.a installdirs
   7 -       if $(RANLIB_TEST_FOR_TARGET); then \
   8           r_f_t=$(RANLIB_FOR_TARGET); \
   9 -       else \
  10 -         r_f_t=: ; \
  11 -       fi; \
  12         $(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
  13           BUILD_PREFIX="$(BUILD_PREFIX)" BUILD_PREFIX_1="$(BUILD_PREFIX_1)" \
  14           AR_FOR_TARGET="$(AR_FOR_TARGET)" \
  15 @@ -2942,11 +2938,7 @@
  16
  17  # Install multiple versions of libgcc.a.
  18  install-multilib: stmp-multilib installdirs
  19 -       if $(RANLIB_TEST_FOR_TARGET); then \
  20           r_f_t=$(RANLIB_FOR_TARGET); \
  21 -       else \
  22 -         r_f_t=: ; \
  23 -       fi; \
  24         $(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
  25           BUILD_PREFIX="$(BUILD_PREFIX)" BUILD_PREFIX_1="$(BUILD_PREFIX_1)" \
  26           AR_FOR_TARGET="$(AR_FOR_TARGET)" \
  27 @@ -3552,9 +3544,7 @@
  28         -if [ -f collect-ld$(exeext) ] ; then (cd stage1 && $(LN_S) ../collect-ld$(exeext) .) ; else true ; fi
  29         -rm -f stage1/libgcc.a stage1/libgcc_eh.a
  30         -cp libgcc.a stage1
  31 -       -if $(RANLIB_TEST_FOR_TARGET) ; then \
  32           $(RANLIB_FOR_TARGET) stage1/libgcc.a; \
  33 -       else true; fi
  34         -if [ -f libgcc_eh.a ] ; then cp libgcc_eh.a stage1; \
  35           if $(RANLIB_TEST_FOR_TARGET) ; then \
  36            $(RANLIB_FOR_TARGET) stage1/libgcc_eh.a; \
  37 @@ -3581,13 +3571,9 @@
  38         -if [ -f collect-ld$(exeext) ] ; then (cd stage2 && $(LN_S) ../collect-ld$(exeext) .) ; else true ; fi
  39         -rm -f stage2/libgcc.a stage2/libgcc_eh.a
  40         -cp libgcc.a stage2
  41 -       -if $(RANLIB_TEST_FOR_TARGET) ; then \
  42           $(RANLIB_FOR_TARGET) stage2/libgcc.a; \
  43 -       else true; fi
  44         -if [ -f libgcc_eh.a ] ; then cp libgcc_eh.a stage2; \
  45 -         if $(RANLIB_TEST_FOR_TARGET) ; then \
  46            $(RANLIB_FOR_TARGET) stage2/libgcc_eh.a; \
  47 -         else true; fi; fi
  48         -for f in .. $(EXTRA_MULTILIB_PARTS); do if [ x$${f} != x.. ]; then \
  49           cp stage2/$${f} . ; \
  50         else true; \
  51 @@ -3610,13 +3596,9 @@
  52         -if [ -f collect-ld$(exeext) ] ; then (cd stage3 && $(LN_S) ../collect-ld$(exeext) .) ; else true ; fi
  53         -rm -f stage3/libgcc.a stage3/libgcc_eh.a
  54         -cp libgcc.a stage3
  55 -       -if $(RANLIB_TEST_FOR_TARGET) ; then \
  56           $(RANLIB_FOR_TARGET) stage3/libgcc.a; \
  57 -       else true; fi
  58         -if [ -f libgcc_eh.a ] ; then cp libgcc_eh.a stage3; \
  59 -         if $(RANLIB_TEST_FOR_TARGET) ; then \
  60            $(RANLIB_FOR_TARGET) stage3/libgcc_eh.a; \
  61 -         else true; fi; fi
  62         -for f in .. $(EXTRA_MULTILIB_PARTS); do if [ x$${f} != x.. ]; then \
  63           cp stage3/$${f} . ; \
  64         else true; \
  65 @@ -3639,13 +3621,9 @@
  66         -if [ -f collect-ld$(exeext) ] ; then (cd stage4 && $(LN_S) ../collect-ld$(exeext) .) ; else true ; fi
  67         -rm -f stage4/libgcc.a stage4/libgcc_eh.a
  68         -cp libgcc.a stage4
  69 -       -if $(RANLIB_TEST_FOR_TARGET) ; then \
  70           $(RANLIB_FOR_TARGET) stage4/libgcc.a; \
  71 -       else true; fi
  72         -if [ -f libgcc_eh.a ] ; then cp libgcc_eh.a stage4; \
  73 -         if $(RANLIB_TEST_FOR_TARGET) ; then \
  74            $(RANLIB_FOR_TARGET) stage4/libgcc_eh.a; \
  75 -         else true; fi; fi
  76         -for f in .. $(EXTRA_MULTILIB_PARTS); do if [ x$${f} != x.. ]; then \
  77           cp stage4/$${f} . ; \
  78         else true; \
  79 --- gcc/mklibgcc.in     Sun Jan 26 03:35:07 2003
  80 +++ gcc/mklibgcc.in     Sun Sep  7 20:49:48 2003
  81 @@ -312,9 +312,7 @@
  82    echo "${dir}/libgcc.a: $libgcc_a_objs"
  83    echo "       -rm -rf ${dir}/libgcc.a"
  84    echo '       $(AR_CREATE_FOR_TARGET)' ${dir}/libgcc.a $libgcc_a_objs
  85 -  echo '       if $(RANLIB_TEST_FOR_TARGET) ; then' \\
  86    echo '         $(RANLIB_FOR_TARGET)' ${dir}/libgcc.a ';' \\
  87 -  echo '       else true; fi;'
  88
  89    if [ "$SHLIB_LINK" ]; then
  90