diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-03-17 19:56:14 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-03-17 19:56:14 +0000 |
| commit | ead8edfe1165a7423dee64dc2fcb862fcf896083 (patch) | |
| tree | 4eed3d54a1c186e8c21176dddce83b4b17627965 | |
| parent | 06402f1dc39d2bfe8095b3c801b2f6fffd0b0acb (diff) | |
| download | ATCD-ead8edfe1165a7423dee64dc2fcb862fcf896083.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ChangeLog-99b | 7 | ||||
| -rw-r--r-- | include/makeinclude/platform_freebsd_pthread.GNU | 19 |
2 files changed, 22 insertions, 4 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index 3b6beafc623..c24f0095ecf 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,10 @@ +Wed Mar 17 07:55:38 1999 Nanbor Wang <nanbor@cs.wustl.edu> + + * include/makeinclude/platform_freebsd_pthread.GNU: Made some + adjustment for building ELF executables which are the default on + FreeBSD 3 and above. I'll incoporate Russell's LinuxThread + change later. + Wed Mar 17 13:36:32 1999 David L. Levine <levine@cs.wustl.edu> * bin/make_release: return non-zero exit status on failure. diff --git a/include/makeinclude/platform_freebsd_pthread.GNU b/include/makeinclude/platform_freebsd_pthread.GNU index 6e997d4efee..34b000e20b9 100644 --- a/include/makeinclude/platform_freebsd_pthread.GNU +++ b/include/makeinclude/platform_freebsd_pthread.GNU @@ -2,20 +2,31 @@ # platform_freebsd_pthread.GNU -optimize = 1 +##################################################### +# Replace 3 with 2 if you are running FreeBSD 2.x.x +# ** How do we detect os version here? +##################################################### +VERSION = 3 -# For pthreads support on FreeBSD, you need +ifneq ($(VERSION),3) +versioned_so = 1 +endif + +optimize = 1 debug = 1 -versioned_so = 1 CC = gcc CXX = g++ CFLAGS += -Wall -Wpointer-arith -pipe -D_THREAD_SAFE CCFLAGS += $(CFLAGS) -fno-implicit-templates DCFLAGS += -g +LDFLAGS = -pthread +ifeq ($(VERSION),3) + LDFLAGS += -Wl,-rpath $(ACE_ROOT)/ace +endif DLD = $(CXX) -LD = $(CXX) -pthread +LD = $(CXX) LIBS += -lstdc++ -lcompat OCFLAGS += -O PIC = -fpic |