Module Name:    src
Committed By:   joerg
Date:           Thu Mar 24 13:33:42 UTC 2011

Modified Files:
        src/tools/binutils: Makefile
        src/tools/gcc: Makefile

Log Message:
Enable support for --sysroot in binutils and gcc.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/tools/binutils/Makefile
cvs rdiff -u -r1.34 -r1.35 src/tools/gcc/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tools/binutils/Makefile
diff -u src/tools/binutils/Makefile:1.18 src/tools/binutils/Makefile:1.19
--- src/tools/binutils/Makefile:1.18	Fri Nov 20 22:51:29 2009
+++ src/tools/binutils/Makefile	Thu Mar 24 13:33:42 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2009/11/20 22:51:29 skrll Exp $
+#	$NetBSD: Makefile,v 1.19 2011/03/24 13:33:42 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -9,7 +9,8 @@
 
 BRANDING?=	\
 	--with-pkgversion="NetBSD Binutils nb1" \
-	--with-bugurl="http://www.NetBSD.org/support/send-pr.html";
+	--with-bugurl="http://www.NetBSD.org/support/send-pr.html"; \
+	--with-lib-path="=/usr/lib" --with-sysroot
 .else
 BRANDING?=	
 .endif

Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.34 src/tools/gcc/Makefile:1.35
--- src/tools/gcc/Makefile:1.34	Wed Dec 23 20:17:13 2009
+++ src/tools/gcc/Makefile	Thu Mar 24 13:33:42 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.34 2009/12/23 20:17:13 mrg Exp $
+#	$NetBSD: Makefile,v 1.35 2011/03/24 13:33:42 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -34,9 +34,12 @@
 		--program-transform-name="s,^,${MACHINE_GNU_PLATFORM}-," \
 		--enable-languages="${GCC_LANGUAGES}"
 
+GCC_CPPFLAGS=	-DNETBSD_TOOLS -DTARGET_SYSTEM_ROOT=0 \
+		-DTARGET_SYSTEM_ROOT_RELOCATABLE
+
 MAKE_ARGS=	MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q} \
 		LIBGCC= LIBGCC1= LIBGCC1_TEST= LIBGCC2= INSTALL_LIBGCC= \
-		EXTRA_PARTS= CPPFLAGS=-DNETBSD_TOOLS \
+		EXTRA_PARTS= CPPFLAGS=${GCC_CPPFLAGS:Q} \
 		AR=${HOST_AR:Q} RANLIB=${HOST_RANLIB:Q}
 
 CONFIGURE_ENV+= gcc_cv_libc_provides_ssp=yes

Reply via email to