diff options
| author | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-02-04 17:45:39 +0000 |
|---|---|---|
| committer | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-02-04 17:45:39 +0000 |
| commit | 264cb260f4fc4b8c88d74f0c125312c15b9c96ab (patch) | |
| tree | a130c1ae6d4c43d223d6d272b0e75641c60966a6 | |
| parent | 65fa8339e930de3f1f88741301099f23b3d613dc (diff) | |
| download | ATCD-264cb260f4fc4b8c88d74f0c125312c15b9c96ab.tar.gz | |
ChangeLogTag: Wed Feb 4 17:41:25 UTC 2004 Craig Rodrigues <crodrigu@bbn.com>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | include/makeinclude/platform_freebsd.GNU | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 21eb974bffd..01bb152ce1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Feb 4 17:41:25 UTC 2004 Craig Rodrigues <crodrigu@bbn.com> + + * include/makeinclude/platform_freebsd.GNU: + Change thread flags to reflect new changes in FreeBSD. + KSE-based -lpthread is now the default library in + FreeBSD-CURRENT. + Tue Feb 3 16:21:49 2004 Steve Huston <shuston@riverace.com> * m4/compiler.m4: If --disable-rtti is specified on AIX, add diff --git a/include/makeinclude/platform_freebsd.GNU b/include/makeinclude/platform_freebsd.GNU index 813de0e2b99..d373f518449 100644 --- a/include/makeinclude/platform_freebsd.GNU +++ b/include/makeinclude/platform_freebsd.GNU @@ -59,12 +59,16 @@ ifeq ($(RET),1) PTHREAD_CFLAGS = -D_THREAD_SAFE PTHREAD_LIBS = -pthread else - PTHREAD_CFLAGS = -D_THREAD_SAFE + RET = $(shell test $(OSVERSION) -lt 502102 && printf 1) + ifeq ($(RET),1) PTHREAD_LIBS = -lc_r + else + PTHREAD_LIBS = -lpthread + endif endif # RET CFLAGS += $(PTHREAD_CFLAGS) -LDFLAGS += $(PTHREAD_LIBS) +LIBS += $(PTHREAD_LIBS) endif # threads |