Source-Changes-HG archive

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

[src/trunk]: src/tools/binutils Handle both places where m68k-parse can be fo...



details:   https://anonhg.NetBSD.org/src/rev/df562d63b246
branches:  trunk
changeset: 372773:df562d63b246
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Dec 25 17:25:22 2022 +0000

description:
Handle both places where m68k-parse can be found (for 2.34 and 2.39)

diffstat:

 tools/binutils/Makefile |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r a509131c4a57 -r df562d63b246 tools/binutils/Makefile
--- a/tools/binutils/Makefile   Sun Dec 25 15:02:29 2022 +0000
+++ b/tools/binutils/Makefile   Sun Dec 25 17:25:22 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.34 2022/12/24 20:17:46 christos Exp $
+#      $NetBSD: Makefile,v 1.35 2022/12/25 17:25:22 christos Exp $
 
 .include <bsd.hostinit.mk>
 
@@ -16,10 +16,18 @@
                --disable-werror --enable-initfini-array=yes \
                ${BRANDING}
 
-build/gas/m68k-parse.c: ${GNUHOSTDIST}/gas/config/m68k-parse.c
+.if exists(${GNUHOSTDIST}/gas/config/m68k-parse.c)
+M68K_PARSE=${GNUHOSTDIST}/gas/config/m68k-parse.c
+.elif exists(${GNUHOSTDIST}/gas/m68k-parse.c) 
+M68K_PARSE=${GNUHOSTDIST}/gas/m68k-parse.c
+.else
+.error "Can't find m68k-parse.c
+.endif
+
+build/gas/m68k-parse.c: ${M68K_PARSE}
        @mkdir build 2>/dev/null || true
        @mkdir build/gas 2>/dev/null || true
-       cat ${GNUHOSTDIST}/gas/config/m68k-parse.c > ${.TARGET}
+       cat ${M68K_PARSE} > ${.TARGET}
 
 .configure_done: build/gas/m68k-parse.c
 



Home | Main Index | Thread Index | Old Index