From 2a1bb2866c30175d0bf7ad64b4cb884202169d82 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Wed, 2 Aug 2006 17:52:00 +0000 Subject: [PATCH] pull up r18350 from trunk r18350@cathode-dark-space: raeburn | 2006-07-21 13:49:07 -0400 ticket: new subject: respect LDFLAGS in NetBSD build target: 1.5.1 tags: pullup An LDFLAGS setting at configure time is ignored in parts of the build. * shlib.conf (*-*-netbsd*): Use $(CC) for LDCOMBINE, and include $(LDFLAGS). ticket: 4037 version_fixed: 1.5.1 git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-5@18403 dc483132-0cff-0310-8789-dd5450dbe970 --- src/config/shlib.conf | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/config/shlib.conf b/src/config/shlib.conf index fbd93393a..2ad82857d 100644 --- a/src/config/shlib.conf +++ b/src/config/shlib.conf @@ -1,3 +1,16 @@ +# This shell script fragment should set a bunch of variables: +# +# CC_LINK_STATIC: How to link a program if we're only building static +# libraries for krb5 (but may use other shared libs, and there may +# be a shared krb5 lib already installed that we shouldn't use). +# CC_LINK_SHARED: How to link a program if we're building shared +# libraries. +# STLIBEXT: Static library extension. +# SHLIBEXT: Shared library extension. +# SHLIBVEXT: Shared library extension, with major version. +# SHLIBSEXT: Shared library extension, with full version. +# (... finish documenting these ...) + # # Set up some defaults. # @@ -229,7 +242,7 @@ mips-*-netbsd*) PICFLAGS=-fPIC SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' SHLIBEXT=.so - LDCOMBINE='ld -Bshareable' + LDCOMBINE='$(CC) -shared $(LDFLAGS)' SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' RPATH_FLAG=-R CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' -- 2.26.2