From: Ken Raeburn <raeburn@mit.edu>
Date: Fri, 21 Jul 2006 17:49:07 +0000 (+0000)
Subject: respect LDFLAGS in NetBSD build
X-Git-Tag: krb5-1.6-alpha1~193
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a136e51c8a5bd5d56ef16de0986e5f766f004ff0;p=krb5.git

respect LDFLAGS in NetBSD build

An LDFLAGS setting at configure time is ignored in parts of the build.

* shlib.conf (*-*-netbsd*): Use $(CC) for LDCOMBINE, and include $(LDFLAGS).

ticket: new
target: 1.5.1
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18350 dc483132-0cff-0310-8789-dd5450dbe970
---

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)'