Module Name: src Committed By: christos Date: Mon Aug 14 16:45:26 UTC 2023
Modified Files: src/tools/gdb: Makefile Log Message: fix cross-gdb To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 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.43 src/tools/gdb/Makefile:1.44 --- src/tools/gdb/Makefile:1.43 Wed Aug 9 14:57:04 2023 +++ src/tools/gdb/Makefile Mon Aug 14 12:45:26 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2023/08/09 18:57:04 christos Exp $ +# $NetBSD: Makefile,v 1.44 2023/08/14 16:45:26 christos Exp $ .include <bsd.hostinit.mk> @@ -10,7 +10,7 @@ FIND_ARGS= \! \( -type d -name sim -prun CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} --disable-nls \ --program-transform-name="s,^,${MACHINE_GNU_PLATFORM}-," \ - --without-mpfr --with-libgmp-prefix=${TOOLDIR} + --without-mpfr MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q} @@ -45,12 +45,15 @@ MKNATIVE_ENV= ${BINENV} ${CONFIGURE_ENV: MKENV_BUILD_MAKE=${MKNATIVE_ENV} ${BUILD_MAKE} -CCADDFLAGS+= --sysroot=${DESTDIR} -B${DESTDIR}/usr/lib/ -I${.OBJDIR}/.native/gcc/include +CCADDFLAGS+= --sysroot=${DESTDIR} -B${DESTDIR}/usr/lib/ -I${.OBJDIR}/.native/include LDADDFLAGS+= -L${DESTDIR}/lib -L${DESTDIR}/usr/lib CXXADDFLAGS+= -D__STDC_FORMAT_MACROS CXXADDFLAGS+= -D__STDC_LIMIT_MACROS CXXADDFLAGS+= -D__STDC_CONSTANT_MACROS HOST_CXXFLAGS+= ${CXXADDFLAGS} +# for gmp +HOST_CPPFLAGS+= -I${.OBJDIR}/.native/include +HOST_LDFLAGS+= -L${GMPOBJ} NEWCONFIGDIR?= ${.CURDIR}/../.. MKNATIVE?= ${.CURDIR}/mknative-gdb @@ -104,9 +107,6 @@ native-gdb: .native/.configure_done ${GDB_MACHINE_ARCH} .native/.configure_done: ${_GNU_CFGSRC} ${.CURDIR}/Makefile - 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 PATH=${TOOLDIR}/bin:$$PATH; export PATH; \ (cd ${.OBJDIR}/.native && \ ${MKNATIVE_ENV} ${HOST_SH} ${GNUHOSTDIST}/configure \ @@ -134,3 +134,10 @@ native-gdb: .native/.configure_done clean: clean.native clean.native: -rm -r -f .native + +.BEGIN: ${.OBJDIR}/.native/include/gmp.h + +${.OBJDIR}/.native/include/gmp.h: ${GMPINC}/gmp.h + 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