Source-Changes-HG archive

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

[src/trunk]: src/tools/gcc use --sysroot with GCC 4.5. (maybe could with 4.1 ...



details:   https://anonhg.NetBSD.org/src/rev/67829c507212
branches:  trunk
changeset: 766385:67829c507212
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Jun 21 09:37:41 2011 +0000

description:
use --sysroot with GCC 4.5. (maybe could with 4.1 too?  the 4.1 code
here is broken right now, anyway, ever since the sysroot changes were
merged into our tree.)

diffstat:

 tools/gcc/Makefile |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r e2e39a5796c2 -r 67829c507212 tools/gcc/Makefile
--- a/tools/gcc/Makefile        Tue Jun 21 09:36:46 2011 +0000
+++ b/tools/gcc/Makefile        Tue Jun 21 09:37:41 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.37 2011/06/21 04:11:12 mrg Exp $
+#      $NetBSD: Makefile,v 1.38 2011/06/21 09:37:41 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -98,8 +98,13 @@
 GCCSRCDIR=${.CURDIR}/../../external/gpl3/gcc/dist
 .endif
 
+.if ${HAVE_GCC} >= 45
+CXXADDFLAGS=   --sysroot=${DESTDIR}
+CCADDFLAGS=    --sysroot=${DESTDIR} -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/
+.else
 CXXADDFLAGS=   ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++
 CCADDFLAGS=    ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/
+.endif
 
 NEWCONFIGDIR?= ${.CURDIR}/../..
 MKNATIVE?=     ${.CURDIR}/mknative-gcc



Home | Main Index | Thread Index | Old Index