3 files changed, 22 insertions, 4 deletions
diff --git a/cross/nios2-binutils/Makefile b/cross/nios2-binutils/Makefile
index dac90ae6fcb..9dad49bc426 100644
--- a/cross/nios2-binutils/Makefile
+++ b/cross/nios2-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/11/18 06:41:27 mef Exp $
+# $NetBSD: Makefile,v 1.4 2013/12/03 02:34:52 mef Exp $
 .include		"../../cross/nios2/Makefile.common"
 PKGNAME=		nios2-binutils-${PKG_VERSION}
 PKG_VERSION=		2.23
@@ -31,6 +31,8 @@ INFO_DIR?=		${NIOS_INFO_DIR}
 #  see mk/configure/gnu-configure.mk
 GNU_CONFIGURE_INFODIR=	${NIOS_INFO_DIR}
 
+.include "options.mk"
+
 do-extract:
 	(cd ${WRKDIR}; tar zxf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}	\
 	        sourceryg++-2013.05-43-nios2-linux-gnu/binutils-2013.05-43.tar.bz2;\
diff --git a/cross/nios2-binutils/options.mk b/cross/nios2-binutils/options.mk
new file mode 100644
index 00000000000..d971cea8d86
--- /dev/null
+++ b/cross/nios2-binutils/options.mk
@@ -0,0 +1,11 @@
+# $NetBSD: options.mk,v 1.1 2013/12/03 02:34:52 mef Exp $
+### Set options
+PKG_OPTIONS_VAR=        PKG_OPTIONS.nios2-binutils
+PKG_SUPPORTED_OPTIONS=  sysroot
+PKG_SUGGESTED_OPTIONS=  sysroot
+
+.include "../../mk/bsd.options.mk"
+
+.if  !empty(PKG_OPTIONS:Msysroot)
+CONFIGURE_ARGS+=	--with-sysroot
+.endif
diff --git a/cross/nios2-gcc41/options.mk b/cross/nios2-gcc41/options.mk
index 5197560806d..f391d31c0ae 100644
--- a/cross/nios2-gcc41/options.mk
+++ b/cross/nios2-gcc41/options.mk
@@ -1,11 +1,16 @@
-# $NetBSD: options.mk,v 1.1 2013/11/16 07:41:00 mef Exp $
+# $NetBSD: options.mk,v 1.2 2013/12/03 02:34:52 mef Exp $
 ### Set options
 PKG_OPTIONS_VAR=        PKG_OPTIONS.nios2-gcc
-PKG_SUPPORTED_OPTIONS=  doc
-PKG_SUGGESTED_OPTIONS=
+PKG_SUPPORTED_OPTIONS=  doc sysroot
+PKG_SUGGESTED_OPTIONS=      sysroot
 
 .include "../../mk/bsd.options.mk"
 
+# See http://mail-index.netbsd.org/tech-toolchain/2011/03/21/msg001511.html
+.if !empty(PKG_OPTIONS:Msysroot)
+CFLAGS+=		-DTARGET_SYSTEM_ROOT=0 -DTARGET_SYSTEM_ROOT_RELOCATABLE
+.endif
+
 # conditional SUBST_CLASSES
 .if empty(PKG_OPTIONS:Mdoc)
 post-patch: