Module Name: src
Committed By: njoly
Date: Fri Dec 24 13:12:10 UTC 2010
Modified Files:
src/gnu/dist/gdb6: Makefile.in
src/tools/gdb: Makefile
Log Message:
Adjust LDFLAGS handling to fix curses detection for mknative-gdb.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/gnu/dist/gdb6/Makefile.in
cvs rdiff -u -r1.17 -r1.18 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/gnu/dist/gdb6/Makefile.in
diff -u src/gnu/dist/gdb6/Makefile.in:1.1.1.2 src/gnu/dist/gdb6/Makefile.in:1.2
--- src/gnu/dist/gdb6/Makefile.in:1.1.1.2 Sun Jul 2 20:11:53 2006
+++ src/gnu/dist/gdb6/Makefile.in Fri Dec 24 13:12:09 2010
@@ -286,7 +286,7 @@
WINDRES = @WINDRES@
CFLAGS = @CFLAGS@
-LDFLAGS =
+LDFLAGS = @LDFLAGS@
LIBCFLAGS = $(CFLAGS)
CXXFLAGS = @CXXFLAGS@
LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
Index: src/tools/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.17 src/tools/gdb/Makefile:1.18
--- src/tools/gdb/Makefile:1.17 Sat May 8 23:18:44 2010
+++ src/tools/gdb/Makefile Fri Dec 24 13:12:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2010/05/08 23:18:44 hans Exp $
+# $NetBSD: Makefile,v 1.18 2010/12/24 13:12:09 njoly Exp $
.include <bsd.own.mk>
@@ -16,7 +16,8 @@
.include "${.CURDIR}/../Makefile.gnuhost"
-CCADDFLAGS= ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/
+CCADDFLAGS= ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include -B${DESTDIR}/usr/lib/
+LDADDFLAGS= -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -Wl,-rpath-link,${DESTDIR}/usr/lib
NEWCONFIGDIR?= ${.CURDIR}/../..
MKNATIVE?= ${.CURDIR}/mknative-gdb
@@ -65,7 +66,7 @@
CC=${CC:Q}' '${CCADDFLAGS:Q} \
CXX=${CXX:Q}' '${CCADDFLAGS:Q} \
CPP=${CPP:Q}' '-isystem' '${DESTDIR}/usr/include \
- CFLAGS= CPPFLAGS= CXXFLAGS= LDFLAGS= \
+ CFLAGS= CPPFLAGS= CXXFLAGS= LDFLAGS=${LDADDFLAGS:Q} \
MSGFMT=${TOOLDIR}/bin/${_TOOL_PREFIX}msgfmt \
XGETTEXT=${TOOLDIR}/bin/${_TOOL_PREFIX}xgettext \
LIBS=-lintl \
