Module Name:    src
Committed By:   christos
Date:           Tue Aug 27 13:56:50 UTC 2024

Modified Files:
        src/tools/gdb: Makefile

Log Message:
copy the rest of the includes and stop using --with-foo=${TOOLDIR} because
it breaks static linking (it picks the tools version of the libraries when
cross building sun2)


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/tools/gdb/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/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.52 src/tools/gdb/Makefile:1.53
--- src/tools/gdb/Makefile:1.52	Mon Aug 26 20:04:28 2024
+++ src/tools/gdb/Makefile	Tue Aug 27 09:56:49 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.52 2024/08/27 00:04:28 christos Exp $
+#	$NetBSD: Makefile,v 1.53 2024/08/27 13:56:49 christos Exp $
 
 .include <bsd.hostinit.mk>
 
@@ -131,15 +131,17 @@ native-gdb: .native/.configure_done
 	mkdir -p ${.OBJDIR}/.native/include
 	# we need to make a copy because ${GMPINC} has a config.h
 	cp -p ${GMPINC}/gmp.h ${.OBJDIR}/.native/include
+	# copy the rest because using --with-foo=${TOOLDIR} breaks with
+	# static linking because it picks the tools version of the libraries
+	cp -p ${MPFRINC}/mpfr.h ${.OBJDIR}/.native/include
+	cp -p ${MPFRINC}/mpf2mpfr.h ${.OBJDIR}/.native/include
+	cp -p ${MPCINC}/mpc.h ${.OBJDIR}/.native/include
 	PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
 		(cd ${.OBJDIR}/.native && \
 			${MKNATIVE_ENV} ${HOST_SH} ${GNUHOSTDIST}/configure \
 			--prefix=/usr \
 			--with-separate-debug-dir=/usr/libdata/debug \
 			--with-zstd=no \
-			--with-mpfr=${TOOLDIR} \
-			--with-mpc=${TOOLDIR} \
-			--with-gmp=${TOOLDIR} \
 			${CONFIGURE_ARGS_SIM} \
 			${CONFIGURE_ARGS_GDBSERVER} \
 			--build=`${GNUHOSTDIST}/config.guess` \

Reply via email to