[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Missing makefile patch



Sorry, forgot to send this one.  This helps multilibs a lot and will
let us remove some cludging from the rules file.

All arches.

Dan

/--------------------------------\  /--------------------------------\
|       Daniel Jacobowitz        |__|        SCS Class of 2002       |
|   Debian GNU/Linux Developer    __    Carnegie Mellon University   |
|         dan@debian.org         |  |       dmj+@andrew.cmu.edu      |
\--------------------------------/  \--------------------------------/
#! /bin/sh -e

# DP: Create dirs to install multilibbed libraries, as necessary.
# DP:  by Daniel Jacobowitz <dan@debian.org>

if [ $# -ne 1 ]; then
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
    exit 1
fi
case "$1" in
    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
    *)
	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
	exit 1
esac
exit 0

--- gcc-2.95.orig/gcc/Makefile.in	Sun Jul 18 12:16:49 1999
+++ gcc-2.95/gcc/Makefile.in	Fri Jul 23 16:46:22 1999
@@ -2499,6 +2499,20 @@
 	-parent=`echo $(man1dir)|sed -e 's@/[^/]*$$@@'`; \
 	if [ -d $$parent ] ; then true ; else mkdir $$parent ; chmod a+rx $$parent ; fi
 	-if [ -d $(man1dir) ] ; then true ; else mkdir $(man1dir) ; chmod a+rx $(man1dir) ; fi
+# Evil hack to avoid adding INSTALL_DIRS to every target makefile fragment
+# which multilibs.
+	if [ x$(INSTALL_LIBGCC) = xinstall-libgcc ]; then true; else \
+	  for i in `$(GCC_FOR_TARGET) --print-multi-lib`; do \
+	    dir=`echo $$i | sed -e 's/;.*$$//'`; \
+	    if [ -d $(libsubdir)/$${dir} ] ; then true ; else mkdir $(libsubdir)/$${dir} ; fi ; \
+	    if [ $(host_canonical) = $(target) ]; then true; else \
+	      if [ -d $(tooldir)/$${dir} ] ; then true ; else mkdir $(tooldir)/$${dir} ; fi ; \
+	    fi; \
+	    if [ x$(enable_version_specific_runtime_libs) = xyes ]; then true; else \
+	      if [ -d $(libdir)/$${dir} ] ; then true ; else mkdir $(libdir)/$${dir} ; fi ; \
+	    fi; \
+	  done; \
+	fi
 
 # Install the compiler executables built during cross compilation.
 install-common: native installdirs $(EXTRA_PARTS) lang.install-common

Reply to: