Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 87932 | Differences between
and this patch

Collapse All | Expand All

(-)gcc/mklibgcc.in~ (-100 / +2 lines)
Lines 623-727 Link Here
623
done
623
done
624
624
625
echo ""
625
echo ""
626
echo "all: $all"
626
echo "all:"
627
627
628
echo ""
628
echo ""
629
echo "install: $all"
629
echo "install:"
630
for ml in $MULTILIBS; do
631
  dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'`
632
  flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`;
633
  if [ $dir != . ]; then
634
    ldir='$(DESTDIR)$(libsubdir)'/$dir
635
    echo "	if [ -d $ldir ]; then true; else $mkinstalldirs $ldir; chmod a+rx $ldir; fi;"
636
  else
637
    ldir='$(DESTDIR)$(libsubdir)'
638
  fi
639
  echo '	$(INSTALL_DATA)' ${dir}/libgcc.a ${ldir}/
640
  echo '	$(RANLIB_FOR_TARGET)' ${ldir}/libgcc.a
641
  echo '	$(INSTALL_DATA)' ${dir}/libgcov.a ${ldir}/
642
  echo '	$(RANLIB_FOR_TARGET)' ${ldir}/libgcov.a
643
644
  if [ "$SHLIB_LINK" ]; then
645
    echo '	$(INSTALL_DATA)' ${dir}/libgcc_eh.a ${ldir}/
646
    echo '	$(RANLIB_FOR_TARGET)' ${ldir}/libgcc_eh.a
647
648
    if [ -z "$SHLIB_MULTILIB" ]; then
649
      if [ "$dir" = . ]; then
650
	shlib_base_name=libgcc_s
651
	shlibunwind_base_name=libunwind
652
      else
653
	shlib_base_name=libgcc_s_`echo $dir | sed s,/,_,g`
654
	shlibunwind_base_name=libunwind_`echo $dir | sed s,/,_,g`
655
      fi
656
      shlib_so_name="$shlib_base_name"
657
      shlibunwind_so_name="$shlibunwind_base_name"
658
      shlib_dir=
659
      shlib_slibdir_qual=
660
      if [ -n "$MULTILIB_OSDIRNAMES" ]; then
661
	gcc_multilib_dir=`./xgcc -B./ $flags --print-multi-directory`
662
	os_multilib_dir=`./xgcc -B./ $flags --print-multi-os-directory`
663
	if [ "$dir" != . ]; then
664
	  shlib_dir="$dir"/
665
	fi
666
	gcc_multilib_sup=`echo $gcc_multilib_dir | sed 's~^[^/]*/~~'`
667
	os_multilib_base=`echo $os_multilib_dir | sed -n "s~/${gcc_multilib_sup}\$~~p"`
668
	if [ -z "$os_multilib_base" ]; then
669
	  shlib_so_name=libgcc_s
670
	  shlibunwind_so_name=libunwind
671
	  if [ "$os_multilib_dir" != "." ]; then
672
	    shlib_slibdir_qual="/$os_multilib_dir"
673
	  fi
674
	else
675
	  shlib_so_name=libgcc_s_`echo $gcc_multilib_sup | sed s,/,_,g`
676
	  shlibunwind_so_name=libunwind_`echo $gcc_multilib_sup | sed s,/,_,g`
677
	  shlib_slibdir_qual="/$os_multilib_base"
678
	fi
679
      fi
680
      echo "	$SHLIB_INSTALL" \
681
	| sed -e "s%@shlib_base_name@%$shlib_base_name%g" \
682
	      -e "s%@shlib_so_name@%$shlib_so_name%g" \
683
	      -e "s%@shlib_dir@%$shlib_dir%g" \
684
	      -e "s%@shlib_slibdir_qual@%$shlib_slibdir_qual%g"
685
      if [ "$LIBUNWIND" ]; then
686
	echo "	$SHLIBUNWIND_INSTALL" \
687
	   | sed -e "s%@shlib_base_name@%$shlibunwind_base_name%g" \
688
		 -e "s%@shlib_so_name@%$shlibunwind_so_name%g" \
689
		 -e "s%@shlib_dir@%$shlib_dir%g" \
690
		 -e "s%@shlib_slibdir_qual@%$shlib_slibdir_qual%g"
691
	libunwinddir='$(DESTDIR)$(slibdir)$(shlib_slibdir_qual)/$(shlib_dir)'
692
	echo '	$(INSTALL_DATA)' ${dir}/libunwind.a ${libunwinddir}/
693
	echo '	$(RANLIB_FOR_TARGET)' ${libunwinddir}/libunwind.a
694
      fi
695
    elif [ "$SHLIB_MULTILIB" = "$dir" ]; then
696
      shlib_base_name="libgcc_s";
697
      echo "	$SHLIB_INSTALL" \
698
	| sed -e "s%@shlib_base_name@%$shlib_base_name%g" \
699
	      -e "s%@shlib_so_name@%$shlib_base_name%g" \
700
	      -e "s%@shlib_dir@%%g" \
701
	      -e "s%@shlib_slibdir_qual@%%g"
702
      if [ "$LIBUNWIND" ]; then
703
	echo "	$SHLIBUNWIND_INSTALL" \
704
	   | sed -e "s%@shlib_base_name@%$shlibunwind_base_name%g" \
705
		 -e "s%@shlib_so_name@%$shlibunwind_base_name%g" \
706
		 -e "s%@shlib_dir@%%g" \
707
		 -e "s%@shlib_slibdir_qual@%%g"
708
	libunwinddir='$(DESTDIR)$(slibdir)'
709
	echo '	$(INSTALL_DATA)' ${dir}/libunwind.a ${libunwinddir}/
710
	echo '	$(RANLIB_FOR_TARGET)' ${libunwinddir}/libunwind.a
711
      fi
712
    fi
713
  fi
714
done
715
for f in $EXTRA_MULTILIB_PARTS; do
716
  for ml in $MULTILIBS; do
717
    dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'`
718
    if [ $dir != . ]; then
719
      out=${dir}/$f
720
      ldir='$(DESTDIR)$(libsubdir)'/$dir
721
    else
722
      out=$f
723
      ldir='$(DESTDIR)$(libsubdir)'
724
    fi
725
    echo '	$(INSTALL_DATA)' $out $ldir/
726
  done
727
done
(-)Makefile.in.old (-2 / +2 lines)
Lines 616-622 Link Here
616
616
617
# The target built for a native build.
617
# The target built for a native build.
618
.PHONY: all.normal
618
.PHONY: all.normal
619
all.normal: @all_build_modules@ all-host all-target
619
all.normal: @all_build_modules@ all-host
620
620
621
.PHONY: all-host
621
.PHONY: all-host
622
all-host: maybe-all-gcc  \
622
all-host: maybe-all-gcc  \
Lines 17390-17396 Link Here
17390
# Installation targets.
17390
# Installation targets.
17391
17391
17392
.PHONY: install uninstall
17392
.PHONY: install uninstall
17393
install: installdirs install-host install-target
17393
install: installdirs install-host
17394
17394
17395
.PHONY: install-host-nogcc
17395
.PHONY: install-host-nogcc
17396
install-host-nogcc:  \
17396
install-host-nogcc:  \

Return to bug 87932