pkgsrc-WIP-changes archive

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

pkglint cleanups for cross compilers



Module Name:	pkgsrc-wip
Committed By:	Lloyd Parkes <lloyd%must-have-coffee.gen.nz@localhost>
Pushed By:	lloyd
Date:		Fri Jan 30 16:01:52 2026 +1300
Changeset:	42584502854ab3398fb7fc5d827edcb97faa0568

Modified Files:
	aarch64-none-elf-binutils/Makefile
	aarch64-none-elf-gcc/Makefile
	arm-none-eabi-binutils/Makefile
	arm-none-eabi-binutils/PLIST
	arm-none-eabi-gcc/ALTERNATIVES
	arm-none-eabi-gcc/Makefile
	arm-none-eabi-gdb/ALTERNATIVES
	arm-none-eabi-gdb/Makefile
	arm-none-eabi-gdb/PLIST
	common-gnu-toolchain/binutils.mk
	common-gnu-toolchain/gcc.mk
	common-gnu-toolchain/gdb.mk
	mipsel-none-elf-binutils/Makefile
	mipsel-none-elf-gcc/Makefile
	powerpc-none-elf-binutils/Makefile
	powerpc-none-elf-gcc/Makefile
	riscv64-none-elf-binutils/Makefile
	riscv64-none-elf-gcc/Makefile
	riscv64-none-elf-gdb/Makefile
Removed Files:
	powerpc-none-elf-gcc/distinfo

Log Message:
pkglint cleanups for cross compilers

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=42584502854ab3398fb7fc5d827edcb97faa0568

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

diffstat:
 aarch64-none-elf-binutils/Makefile |  2 +-
 aarch64-none-elf-gcc/Makefile      |  2 +-
 arm-none-eabi-binutils/Makefile    |  4 ++--
 arm-none-eabi-binutils/PLIST       |  3 +--
 arm-none-eabi-gcc/ALTERNATIVES     |  3 ---
 arm-none-eabi-gcc/Makefile         |  2 +-
 arm-none-eabi-gdb/ALTERNATIVES     |  1 -
 arm-none-eabi-gdb/Makefile         |  2 +-
 arm-none-eabi-gdb/PLIST            | 38 +++++++++++++++++++-------------------
 common-gnu-toolchain/binutils.mk   |  4 ++--
 common-gnu-toolchain/gcc.mk        |  9 ++++-----
 common-gnu-toolchain/gdb.mk        |  3 ++-
 mipsel-none-elf-binutils/Makefile  |  2 +-
 mipsel-none-elf-gcc/Makefile       |  2 +-
 powerpc-none-elf-binutils/Makefile |  2 +-
 powerpc-none-elf-gcc/Makefile      |  2 +-
 powerpc-none-elf-gcc/distinfo      | 14 --------------
 riscv64-none-elf-binutils/Makefile |  2 +-
 riscv64-none-elf-gcc/Makefile      |  2 +-
 riscv64-none-elf-gdb/Makefile      |  2 +-
 20 files changed, 41 insertions(+), 60 deletions(-)

diffs:
diff --git a/aarch64-none-elf-binutils/Makefile b/aarch64-none-elf-binutils/Makefile
index 55d3bb9bdd..df780be397 100644
--- a/aarch64-none-elf-binutils/Makefile
+++ b/aarch64-none-elf-binutils/Makefile
@@ -5,5 +5,5 @@ TARGET=		aarch64-none-elf
 MAINTAINER=	port-arm%NetBSD.org@localhost
 COMMENT=	Cross binutils for bare metal AArch64 ELF
 
-.include "../common-gnu-toolchain/binutils.mk"
+.include "../../wip/common-gnu-toolchain/binutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/aarch64-none-elf-gcc/Makefile b/aarch64-none-elf-gcc/Makefile
index 9b598c9d3d..8a559c7ced 100644
--- a/aarch64-none-elf-gcc/Makefile
+++ b/aarch64-none-elf-gcc/Makefile
@@ -7,5 +7,5 @@ COMMENT=		GCC for bare metal AArch64 ELF
 
 MKPIE_SUPPORTED=	no # relocation errors on netbsd-9 aarch64
 
-.include "../common-gnu-toolchain/gcc.mk"
+.include "../../wip/common-gnu-toolchain/gcc.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/arm-none-eabi-binutils/Makefile b/arm-none-eabi-binutils/Makefile
index 51d62e1c60..740b8a6ff2 100644
--- a/arm-none-eabi-binutils/Makefile
+++ b/arm-none-eabi-binutils/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.12 2021/12/14 10:33:57 jperkin Exp $
 
-TARGET=		arm-none-eabi	
+TARGET=		arm-none-eabi
 
 MAINTAINER=	ryoon%NetBSD.org@localhost
 COMMENT=	Cross binutils for bare metal ARM EABI
 
-.include "../common-gnu-toolchain/binutils.mk"
+.include "../../wip/common-gnu-toolchain/binutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/arm-none-eabi-binutils/PLIST b/arm-none-eabi-binutils/PLIST
index 14b6be806c..ca0dcbb0d6 100644
--- a/arm-none-eabi-binutils/PLIST
+++ b/arm-none-eabi-binutils/PLIST
@@ -19,7 +19,6 @@ cross-arm-none-eabi/arm-none-eabi/lib/ldscripts/armelf.xdc
 cross-arm-none-eabi/arm-none-eabi/lib/ldscripts/armelf.xdce
 cross-arm-none-eabi/arm-none-eabi/lib/ldscripts/armelf.xdcer
 cross-arm-none-eabi/arm-none-eabi/lib/ldscripts/armelf.xde
-cross-arm-none-eabi/arm-none-eabi/lib/ldscripts/armelf.xde
 cross-arm-none-eabi/arm-none-eabi/lib/ldscripts/armelf.xder
 cross-arm-none-eabi/arm-none-eabi/lib/ldscripts/armelf.xdw
 cross-arm-none-eabi/arm-none-eabi/lib/ldscripts/armelf.xdwe
@@ -59,8 +58,8 @@ cross-arm-none-eabi/bin/arm-none-eabi-strings
 cross-arm-none-eabi/bin/arm-none-eabi-strip
 cross-arm-none-eabi/info/as.info
 cross-arm-none-eabi/info/bfd.info
-cross-arm-none-eabi/info/ctf-spec.info
 cross-arm-none-eabi/info/binutils.info
+cross-arm-none-eabi/info/ctf-spec.info
 cross-arm-none-eabi/info/gprof.info
 cross-arm-none-eabi/info/ld.info
 cross-arm-none-eabi/info/ldint.info
diff --git a/arm-none-eabi-gcc/ALTERNATIVES b/arm-none-eabi-gcc/ALTERNATIVES
index bb881129f8..3296cc6bf6 100644
--- a/arm-none-eabi-gcc/ALTERNATIVES
+++ b/arm-none-eabi-gcc/ALTERNATIVES
@@ -6,6 +6,3 @@ bin/arm-none-eabi-gcc-@PKGVERSION@ @PREFIX@/cross-arm-none-eabi/bin/arm-none-eab
 bin/arm-none-eabi-gcc-ar @PREFIX@/cross-arm-none-eabi/bin/arm-none-eabi-gcc-ar
 bin/arm-none-eabi-gcc-nm @PREFIX@/cross-arm-none-eabi/bin/arm-none-eabi-gcc-nm
 bin/arm-none-eabi-gcc-ranlib @PREFIX@/cross-arm-none-eabi/bin/arm-none-eabi-gcc-ranlib
-bin/arm-none-eabi-gcov @PREFIX@/cross-arm-none-eabi/bin/arm-none-eabi-gcov
-bin/arm-none-eabi-gcov-dump @PREFIX@/cross-arm-none-eabi/bin/arm-none-eabi-gcov-dump
-bin/arm-none-eabi-gcov-tool @PREFIX@/cross-arm-none-eabi/bin/arm-none-eabi-gcov-tool
diff --git a/arm-none-eabi-gcc/Makefile b/arm-none-eabi-gcc/Makefile
index 42428112a6..0a3faa422c 100644
--- a/arm-none-eabi-gcc/Makefile
+++ b/arm-none-eabi-gcc/Makefile
@@ -7,5 +7,5 @@ COMMENT=		GCC for bare metal ARM EABI
 
 CONFIGURE_ARGS+=	--with-multilib-list=aprofile,rmprofile
 
-.include "../common-gnu-toolchain/gcc.mk"
+.include "../../wip/common-gnu-toolchain/gcc.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/arm-none-eabi-gdb/ALTERNATIVES b/arm-none-eabi-gdb/ALTERNATIVES
index 4bb8f84f54..bc289b7ae6 100644
--- a/arm-none-eabi-gdb/ALTERNATIVES
+++ b/arm-none-eabi-gdb/ALTERNATIVES
@@ -1,2 +1 @@
 bin/arm-none-eabi-gdb @PREFIX@/cross-arm-none-eabi/bin/arm-none-eabi-gdb
-bin/arm-none-eabi-run @PREFIX@/cross-arm-none-eabi/bin/arm-none-eabi-run
diff --git a/arm-none-eabi-gdb/Makefile b/arm-none-eabi-gdb/Makefile
index fa06fcc4b1..8cc82f8e7d 100644
--- a/arm-none-eabi-gdb/Makefile
+++ b/arm-none-eabi-gdb/Makefile
@@ -5,5 +5,5 @@ TARGET=			arm-none-eabi
 MAINTAINER=		ryoon%NetBSD.org@localhost
 COMMENT=		Cross GDB for bare metal ARM EABI
 
-.include "../common-gnu-toolchain/gdb.mk"
+.include "../../wip/common-gnu-toolchain/gdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/arm-none-eabi-gdb/PLIST b/arm-none-eabi-gdb/PLIST
index 3c1c4dee7d..30a3b7195b 100644
--- a/arm-none-eabi-gdb/PLIST
+++ b/arm-none-eabi-gdb/PLIST
@@ -11,25 +11,6 @@ cross-arm-none-eabi/man/man1/arm-none-eabi-gdb.1
 cross-arm-none-eabi/man/man1/arm-none-eabi-gdbserver.1
 cross-arm-none-eabi/man/man1/arm-none-eabi-gstack.1
 cross-arm-none-eabi/man/man5/arm-none-eabi-gdbinit.5
-cross-arm-none-eabi/share/gdb/syscalls/aarch64-linux.xml
-cross-arm-none-eabi/share/gdb/syscalls/amd64-linux.xml
-cross-arm-none-eabi/share/gdb/syscalls/arm-linux.xml
-cross-arm-none-eabi/share/gdb/syscalls/freebsd.xml
-cross-arm-none-eabi/share/gdb/syscalls/gdb-syscalls.dtd
-cross-arm-none-eabi/share/gdb/syscalls/i386-linux.xml
-cross-arm-none-eabi/share/gdb/syscalls/loongarch-linux.xml
-cross-arm-none-eabi/share/gdb/syscalls/mips-n32-linux.xml
-cross-arm-none-eabi/share/gdb/syscalls/mips-n64-linux.xml
-cross-arm-none-eabi/share/gdb/syscalls/mips-o32-linux.xml
-cross-arm-none-eabi/share/gdb/syscalls/netbsd.xml
-cross-arm-none-eabi/share/gdb/syscalls/ppc-linux.xml
-cross-arm-none-eabi/share/gdb/syscalls/ppc64-linux.xml
-cross-arm-none-eabi/share/gdb/syscalls/s390-linux.xml
-cross-arm-none-eabi/share/gdb/syscalls/s390x-linux.xml
-cross-arm-none-eabi/share/gdb/syscalls/sparc-linux.xml
-cross-arm-none-eabi/share/gdb/syscalls/sparc64-linux.xml
-cross-arm-none-eabi/share/gdb/system-gdbinit/elinos.py
-cross-arm-none-eabi/share/gdb/system-gdbinit/wrs-linux.py
 ${PLIST.python}cross-arm-none-eabi/share/gdb/python/gdb/FrameDecorator.py
 ${PLIST.python}cross-arm-none-eabi/share/gdb/python/gdb/FrameIterator.py
 ${PLIST.python}cross-arm-none-eabi/share/gdb/python/gdb/__init__.py
@@ -82,3 +63,22 @@ ${PLIST.python}cross-arm-none-eabi/share/gdb/python/gdb/styling.py
 ${PLIST.python}cross-arm-none-eabi/share/gdb/python/gdb/types.py
 ${PLIST.python}cross-arm-none-eabi/share/gdb/python/gdb/unwinder.py
 ${PLIST.python}cross-arm-none-eabi/share/gdb/python/gdb/xmethod.py
+cross-arm-none-eabi/share/gdb/syscalls/aarch64-linux.xml
+cross-arm-none-eabi/share/gdb/syscalls/amd64-linux.xml
+cross-arm-none-eabi/share/gdb/syscalls/arm-linux.xml
+cross-arm-none-eabi/share/gdb/syscalls/freebsd.xml
+cross-arm-none-eabi/share/gdb/syscalls/gdb-syscalls.dtd
+cross-arm-none-eabi/share/gdb/syscalls/i386-linux.xml
+cross-arm-none-eabi/share/gdb/syscalls/loongarch-linux.xml
+cross-arm-none-eabi/share/gdb/syscalls/mips-n32-linux.xml
+cross-arm-none-eabi/share/gdb/syscalls/mips-n64-linux.xml
+cross-arm-none-eabi/share/gdb/syscalls/mips-o32-linux.xml
+cross-arm-none-eabi/share/gdb/syscalls/netbsd.xml
+cross-arm-none-eabi/share/gdb/syscalls/ppc-linux.xml
+cross-arm-none-eabi/share/gdb/syscalls/ppc64-linux.xml
+cross-arm-none-eabi/share/gdb/syscalls/s390-linux.xml
+cross-arm-none-eabi/share/gdb/syscalls/s390x-linux.xml
+cross-arm-none-eabi/share/gdb/syscalls/sparc-linux.xml
+cross-arm-none-eabi/share/gdb/syscalls/sparc64-linux.xml
+cross-arm-none-eabi/share/gdb/system-gdbinit/elinos.py
+cross-arm-none-eabi/share/gdb/system-gdbinit/wrs-linux.py
diff --git a/common-gnu-toolchain/binutils.mk b/common-gnu-toolchain/binutils.mk
index a9f7503f3d..e791f93336 100644
--- a/common-gnu-toolchain/binutils.mk
+++ b/common-gnu-toolchain/binutils.mk
@@ -30,8 +30,8 @@ TOOLCHAIN_PREFIX=	${PREFIX}/cross-${TARGET}
 
 GNU_CONFIGURE_PREFIX=	${TOOLCHAIN_PREFIX}
 
-DISTINFO_FILE?=	${.CURDIR}/../../cross/common-gnu-toolchain/distinfo-binutils
-PATCHDIR?=	${.CURDIR}/../../cross/common-gnu-toolchain/patches-binutils
+DISTINFO_FILE?=	${.CURDIR}/../../wip/common-gnu-toolchain/distinfo-binutils
+PATCHDIR?=	${.CURDIR}/../../wip/common-gnu-toolchain/patches-binutils
 
 pre-configure:
 	${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
diff --git a/common-gnu-toolchain/gcc.mk b/common-gnu-toolchain/gcc.mk
index 15eca110b8..5fa1b66712 100644
--- a/common-gnu-toolchain/gcc.mk
+++ b/common-gnu-toolchain/gcc.mk
@@ -4,10 +4,10 @@ GCC_VERSION?=		14.3.0
 
 .if ${GCC_VERSION} == 14.3.0
 NEWLIBVER?=		4.5.0.20241231
-DEPENDS+=		cross-${TARGET}-binutils>=2.45:../../cross/${TARGET}-binutils
+DEPENDS+=		cross-${TARGET}-binutils>=2.45:../../wip/${TARGET}-binutils
 .elif ${GCC_VERSION} == 13.2.0
 NEWLIBVER=		4.3.0.20230120
-DEPENDS+=		cross-${TARGET}-binutils>=2.42:../../cross/${TARGET}-binutils
+DEPENDS+=		cross-${TARGET}-binutils>=2.42:../../wip/${TARGET}-binutils
 .endif
 
 DISTNAME?=		gcc-${GCC_VERSION}
@@ -43,7 +43,6 @@ USE_TOOLS+=		bash gmake gsed makeinfo perl
 GNU_CONFIGURE=		yes
 GNU_CONFIGURE_STRICT=	no # has sub-configures
 CHECK_PORTABILITY_SKIP+=contrib/*
-MKPIE_SUPPORTED=	no # relocation errors on netbsd-9 aarch64
 
 GNU_CONFIGURE_PREFIX=	${TOOLCHAIN_PREFIX}
 
@@ -64,8 +63,8 @@ INFO_FILES=		yes
 # PLIST.libcpp=	yes
 # .endif
 
-DISTINFO_FILE?=	${.CURDIR}/../../cross/common-gnu-toolchain/distinfo-${DISTNAME}
-PATCHDIR?=	${.CURDIR}/../../cross/common-gnu-toolchain/patches-${DISTNAME}
+DISTINFO_FILE?=	${.CURDIR}/../../wip/common-gnu-toolchain/distinfo-${DISTNAME}
+PATCHDIR?=	${.CURDIR}/../../wip/common-gnu-toolchain/patches-${DISTNAME}
 
 post-extract:
 	${LN} -s ${WRKDIR}/newlib-${NEWLIBVER}/newlib ${WRKSRC}/newlib
diff --git a/common-gnu-toolchain/gdb.mk b/common-gnu-toolchain/gdb.mk
index 5be2dbbf3b..16ad8b5e1e 100644
--- a/common-gnu-toolchain/gdb.mk
+++ b/common-gnu-toolchain/gdb.mk
@@ -31,7 +31,8 @@ REPLACE_BASH+=		gdb/gstack-1.in
 # If ever necessary, this should be fixed using REPLACE_BASH.
 CHECK_PORTABILITY_SKIP+=	sim/testsuite/sim/bfin/run-tests.sh
 
-DISTINFO_FILE?=	${.CURDIR}/../../cross/common-gnu-toolchain/distinfo-${DISTNAME}
+DISTINFO_FILE?=	${.CURDIR}/../../wip/common-gnu-toolchain/distinfo-${DISTNAME}
+PATCHDIR?=	${.CURDIR}/../../wip/common-gnu-toolchain/patches-${DISTNAME}
 
 .include "gdb-options.mk"
 .include "../../mk/bsd.prefs.mk"
diff --git a/mipsel-none-elf-binutils/Makefile b/mipsel-none-elf-binutils/Makefile
index c42166c630..677996e911 100644
--- a/mipsel-none-elf-binutils/Makefile
+++ b/mipsel-none-elf-binutils/Makefile
@@ -5,5 +5,5 @@ TARGET=		mipsel-none-elf
 MAINTAINER=	port-mips%NetBSD.org@localhost
 COMMENT=	Cross binutils for bare metal 32-bit little-endian ELF
 
-.include "../common-gnu-toolchain/binutils.mk"
+.include "../../wip/common-gnu-toolchain/binutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mipsel-none-elf-gcc/Makefile b/mipsel-none-elf-gcc/Makefile
index 5ad274fb77..a50c6844d5 100644
--- a/mipsel-none-elf-gcc/Makefile
+++ b/mipsel-none-elf-gcc/Makefile
@@ -9,5 +9,5 @@ COMMENT=		GCC for bare metal MIPS 32-bit little-endian ELF
 # Relocations result in a linker error.
 MKPIE_SUPPORTED=	no
 
-.include "../common-gnu-toolchain/gcc.mk"
+.include "../../wip/common-gnu-toolchain/gcc.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/powerpc-none-elf-binutils/Makefile b/powerpc-none-elf-binutils/Makefile
index b642226067..a94d12740f 100644
--- a/powerpc-none-elf-binutils/Makefile
+++ b/powerpc-none-elf-binutils/Makefile
@@ -5,5 +5,5 @@ TARGET=		powerpc-none-elf
 MAINTAINER=	port-powerpc%NetBSD.org@localhost
 COMMENT=	Cross binutils for bare metal PowerPC ELF
 
-.include "../common-gnu-toolchain/binutils.mk"
+.include "../../wip/common-gnu-toolchain/binutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/powerpc-none-elf-gcc/Makefile b/powerpc-none-elf-gcc/Makefile
index ba8736c8fc..6aaf952290 100644
--- a/powerpc-none-elf-gcc/Makefile
+++ b/powerpc-none-elf-gcc/Makefile
@@ -9,5 +9,5 @@ COMMENT=		GCC for bare metal PowerPC ELF
 # Relocations result in a linker error.
 MKPIE_SUPPORTED=	no
 
-.include "../common-gnu-toolchain/gcc.mk"
+.include "../../wip/common-gnu-toolchain/gcc.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/powerpc-none-elf-gcc/distinfo b/powerpc-none-elf-gcc/distinfo
deleted file mode 100644
index 9fb0ab2169..0000000000
--- a/powerpc-none-elf-gcc/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.5 2022/04/15 17:16:09 tnn Exp $
-
-BLAKE2s (gcc-8.3.0.tar.xz) = 395b2851da05d2ee21dfe3ec95e33482b63aeea7d37db423ffb7ebefd6547499
-SHA512 (gcc-8.3.0.tar.xz) = 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802
-Size (gcc-8.3.0.tar.xz) = 63694700 bytes
-BLAKE2s (newlib-3.1.0.tar.gz) = 293c92c6e8e0848083b3193b2c20a249eeb5e2ca318d0de799e411bdb41a73f5
-SHA512 (newlib-3.1.0.tar.gz) = efc4c3ab7153387780d141386bca5d3e20c9d25ae3e6b87cf94c8df9d301ce5926dacdff9bd33aeb9781559d933c3d0ae77f4e5b46120d90792f75dbfde702c7
-Size (newlib-3.1.0.tar.gz) = 17958952 bytes
-SHA1 (patch-gcc_config_host-darwin.c) = bb6513d096bed62a3c40a6543c6c854e5c20ef9d
-SHA1 (patch-gcc_plugin.c) = cd5b6a1255104760cf7c8e7092943c250b30e35c
-SHA1 (patch-gcc_system.h) = 72a75ff773b9b5f3d2f16f4ec7d29e032aba5f53
-SHA1 (patch-libcc1_configure) = 0368733ddf79b109fcc7146b0baeb37ab31e634a
-SHA1 (patch-libcc1_connection.cc) = 2acd56a6f62b29ed3f02eecb7bf103e4564a442c
-SHA1 (patch-libiberty_Makefile.in) = 7ea2578b5b77cb4adcd4afe3d63739efc68a1540
diff --git a/riscv64-none-elf-binutils/Makefile b/riscv64-none-elf-binutils/Makefile
index e350e99f2b..03309c7033 100644
--- a/riscv64-none-elf-binutils/Makefile
+++ b/riscv64-none-elf-binutils/Makefile
@@ -5,5 +5,5 @@ TARGET=		riscv64-none-elf
 MAINTAINER=	port-riscv%NetBSD.org@localhost
 COMMENT=	Cross binutils for bare metal RISC-V 64-bit and 32-bit ELF
 
-.include "../common-gnu-toolchain/binutils.mk"
+.include "../../wip/common-gnu-toolchain/binutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/riscv64-none-elf-gcc/Makefile b/riscv64-none-elf-gcc/Makefile
index ba78b943b6..6da719cee3 100644
--- a/riscv64-none-elf-gcc/Makefile
+++ b/riscv64-none-elf-gcc/Makefile
@@ -8,5 +8,5 @@ COMMENT=		GCC for bare metal RISC-V 32/64 bit little-endian ELF
 CHECK_PORTABILITY_SKIP+=	contrib/*
 CHECK_PORTABILITY_SKIP+=	gcc/config/nvptx/gen-opt.sh
 
-.include "../common-gnu-toolchain/gcc.mk"
+.include "../../wip/common-gnu-toolchain/gcc.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/riscv64-none-elf-gdb/Makefile b/riscv64-none-elf-gdb/Makefile
index 255c8eb445..565750b53e 100644
--- a/riscv64-none-elf-gdb/Makefile
+++ b/riscv64-none-elf-gdb/Makefile
@@ -5,5 +5,5 @@ TARGET=			riscv64-none-elf
 MAINTAINER=		port-riscv%NetBSD.org@localhost
 COMMENT=		Cross GDB for bare metal RISC-V
 
-.include "../common-gnu-toolchain/gdb.mk"
+.include "../../wip/common-gnu-toolchain/gdb.mk"
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index