diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2004-07-12 01:41:27 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2004-07-12 01:41:27 +0000 |
| commit | 902659077b43557e2bb7c5e52e8b4db204181ac9 (patch) | |
| tree | 74f3b56759ef964f8a353198bce8a85e8e1be0f5 /src/config | |
| parent | 2cc791edb53dd12e95ad56fd522c17ef7eb16ede (diff) | |
| download | krb5-902659077b43557e2bb7c5e52e8b4db204181ac9.tar.gz krb5-902659077b43557e2bb7c5e52e8b4db204181ac9.tar.xz krb5-902659077b43557e2bb7c5e52e8b4db204181ac9.zip | |
* shlib.conf (alpha*-dec-osf*): Use $(PTHREAD_CFLAGS) in CC_LINK_SHARED and
CC_LINK_STATIC.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16585 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/ChangeLog | 5 | ||||
| -rw-r--r-- | src/config/shlib.conf | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/config/ChangeLog b/src/config/ChangeLog index 871e93dc1..3668b8904 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,8 @@ +2004-07-11 Ken Raeburn <raeburn@mit.edu> + + * shlib.conf (alpha*-dec-osf*): Use $(PTHREAD_CFLAGS) in + CC_LINK_SHARED and CC_LINK_STATIC. + 2004-07-09 Ken Raeburn <raeburn@mit.edu> * shlib.conf (alpha*-dec-osf*): Use $(PTHREAD_CFLAGS) in diff --git a/src/config/shlib.conf b/src/config/shlib.conf index f45677351..7078afeac 100644 --- a/src/config/shlib.conf +++ b/src/config/shlib.conf @@ -44,16 +44,16 @@ alpha*-dec-osf*) SHLIB_EXPFLAGS='-rpath $(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' PROFFLAGS=-pg RPATH_FLAG='-Wl,-rpath -Wl,' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(PTHREAD_CFLAGS) $(LDFLAGS)' if test "$krb5_cv_prog_gcc" = yes; then # Really should check for gnu ld vs system ld, too. - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(PTHREAD_CFLAGS) $(LDFLAGS)' else # Need -oldstyle_liblookup to avoid picking up shared libs from # other builds. OSF/1 / Tru64 ld programs look through the entire # library path for shared libs prior to looking through the # entire library path for static libs. - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) -Wl,-oldstyle_liblookup $(CFLAGS) $(LDFLAGS)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) -Wl,-oldstyle_liblookup $(CFLAGS) $(PTHREAD_CFLAGS) $(LDFLAGS)' fi # _RLD_ROOT hack needed to repoint "root" directory for purposes # of searching for shared libs, since RPATHs take precedence over |