[src/trunk]: src Adjust LDFLAGS handling to fix curses detection for mknative...

[njoly <njoly%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/666a47fcef1c
branches:  trunk
changeset: 760021:666a47fcef1c
user:      njoly <njoly%NetBSD.org@localhost>
date:      Fri Dec 24 13:12:09 2010 +0000

description:
Adjust LDFLAGS handling to fix curses detection for mknative-gdb.

diffstat:

 gnu/dist/gdb6/Makefile.in |  2 +-
 tools/gdb/Makefile        |  7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r 647abaf7d01d -r 666a47fcef1c gnu/dist/gdb6/Makefile.in
--- a/gnu/dist/gdb6/Makefile.in Fri Dec 24 13:00:24 2010 +0000
+++ b/gnu/dist/gdb6/Makefile.in Fri Dec 24 13:12:09 2010 +0000
@@ -286,7 +286,7 @@
 WINDRES = @WINDRES@
 
 CFLAGS = @CFLAGS@
-LDFLAGS = 
+LDFLAGS = @LDFLAGS@
 LIBCFLAGS = $(CFLAGS)
 CXXFLAGS = @CXXFLAGS@
 LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
diff -r 647abaf7d01d -r 666a47fcef1c tools/gdb/Makefile
--- a/tools/gdb/Makefile        Fri Dec 24 13:00:24 2010 +0000
+++ b/tools/gdb/Makefile        Fri Dec 24 13:12:09 2010 +0000
@@ -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 \