diff options
| author | itojun <itojun@pkgsrc.org> | 2001-01-09 13:24:46 +0000 |
|---|---|---|
| committer | itojun <itojun@pkgsrc.org> | 2001-01-09 13:24:46 +0000 |
| commit | be0eca79a3498bcba587978ed5af7a833bd688f7 (patch) | |
| tree | d36b88a6f9ec6456b3b644e5a56e4d2e257305ad | |
| parent | cc659bea2225307b67d1d3707005d1c5810af494 (diff) | |
| download | pkgsrc-be0eca79a3498bcba587978ed5af7a833bd688f7.tar.gz | |
on egcs installation, use install-multilib if we are using multilib target.
fixes libgcc.a build problem mentioned on port-sh3.
we should not hardcode targets into egcs-install, we should modify
egcs/gcc/Makefile.in and obey whatever configure decided...
| -rw-r--r-- | cross/COMMON/cross.mk | 10 | ||||
| -rw-r--r-- | cross/sh-netbsdcoff/Makefile | 3 | ||||
| -rw-r--r-- | cross/shel-netbsdcoff/Makefile | 3 |
3 files changed, 12 insertions, 4 deletions
diff --git a/cross/COMMON/cross.mk b/cross/COMMON/cross.mk index a3aea3b9221..26d3c666aec 100644 --- a/cross/COMMON/cross.mk +++ b/cross/COMMON/cross.mk @@ -1,4 +1,4 @@ -# $NetBSD: cross.mk,v 1.16 2000/11/09 13:04:55 wiz Exp $ +# $NetBSD: cross.mk,v 1.17 2001/01/09 13:24:46 itojun Exp $ # Shared definitions for building a cross-compile environment. @@ -99,6 +99,12 @@ EGCS_WRKSRC= ${WRKDIR}/${EGCS_DISTNAME} EGCS_LANGUAGES= c # add to these below BUILD_DEPENDS+= autoheader:../../devel/autoconf +.if defined(EGCS_MULTILIB) +EGCS_INSTALL_LIB=install-multilib +.else +EGCS_INSTALL_LIB=install-libgcc +.endif + .if defined(EGCS_NO_RUNTIME) || defined(EGCS_FAKE_RUNTIME) EGCS_NO_CXX_RUNTIME= yes EGCS_NO_F77_RUNTIME= yes @@ -209,7 +215,7 @@ egcs-build: egcs-install: @cd ${EGCS_WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${EGCS_MAKE_FLAGS} \ - install-common install-headers install-libgcc install-driver + install-common install-headers ${EGCS_INSTALL_LIB} install-driver ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION} ${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-gcc ${PREFIX}/bin/${TARGET_ARCH}-cc ${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-gcc ${TARGET_DIR}/bin/cc diff --git a/cross/sh-netbsdcoff/Makefile b/cross/sh-netbsdcoff/Makefile index 94f7f03fbdb..21df4d66ecc 100644 --- a/cross/sh-netbsdcoff/Makefile +++ b/cross/sh-netbsdcoff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/01/04 01:20:48 itojun Exp $ +# $NetBSD: Makefile,v 1.2 2001/01/09 13:24:47 itojun Exp $ # DISTVERSION= 1.3.0.0 @@ -14,6 +14,7 @@ BINUTILS_GNUTARGET= coff-sh BINUTILS_LDEMULATION= shunx USE_CROSS_EGCS= yes EGCS_FAKE_RUNTIME= yes +EGCS_MULTILIB= yes TARGET_ARCH= sh-netbsdcoff diff --git a/cross/shel-netbsdcoff/Makefile b/cross/shel-netbsdcoff/Makefile index 3f6882a57d5..35ec7704479 100644 --- a/cross/shel-netbsdcoff/Makefile +++ b/cross/shel-netbsdcoff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/01/04 01:21:09 itojun Exp $ +# $NetBSD: Makefile,v 1.2 2001/01/09 13:24:47 itojun Exp $ # DISTVERSION= 1.3.0.0 @@ -14,6 +14,7 @@ BINUTILS_GNUTARGET= coff-shl BINUTILS_LDEMULATION= shlunx USE_CROSS_EGCS= yes EGCS_FAKE_RUNTIME= yes +EGCS_MULTILIB= yes TARGET_ARCH= shel-netbsdcoff |