diff options
| author | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-03 04:12:25 +0000 |
|---|---|---|
| committer | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-03 04:12:25 +0000 |
| commit | 295728e46b2f727e7fc94259656141bff0cb1963 (patch) | |
| tree | c76f29b9cfb028b80e4d68ef6a4ae31feffa69cf | |
| parent | 6c3f6486a572e7ca7738a953fb55cc601d9b7156 (diff) | |
| download | ATCD-295728e46b2f727e7fc94259656141bff0cb1963.tar.gz | |
Mon Nov 3 04:12:12 UTC 2003 Craig Rodrigues <crodrigu@bbn.com>
| -rw-r--r-- | include/makeinclude/platform_freebsd.GNU | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/include/makeinclude/platform_freebsd.GNU b/include/makeinclude/platform_freebsd.GNU index 93705bdf59e..813de0e2b99 100644 --- a/include/makeinclude/platform_freebsd.GNU +++ b/include/makeinclude/platform_freebsd.GNU @@ -2,8 +2,15 @@ # platform_freebsd.GNU -VERSION := $(shell uname -r | sed -e "s/`uname -r | sed -e 's/.//'`//") -ifeq ($(VERSION),2) +## See /usr/ports/Mk/bsd.port.mk for sample usage of the OSVERSION +## variable, especially with respect to defining the correct compiler +## flags for threads. +OSVERSION := $(shell sysctl -n kern.osreldate) + +## GNU make does not support boolean conditional expressions +## so we have to use a dummy RET variable. +RET = $(shell test $(OSVERSION) -ge 200000 && printf 1) +ifeq ($(RET),1) versioned_so = 1 endif @@ -28,7 +35,8 @@ CXX = g++ CFLAGS += -W -Wall -Wpointer-arith -pipe DCFLAGS += -g -ifneq ($(VERSION),3) +RET = $(shell test $(OSVERSION) -ge 300000 && printf 1) +ifneq ($(RET),1) LDFLAGS += -Wl,-rpath $(ACE_ROOT)/ace endif DLD = $(CXX) @@ -43,9 +51,21 @@ SOFLAGS += $(CPPFLAGS) -shared SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< PRELIB = @echo +## Set the correct compiler flags for pthreads. This +## test is copied from /usr/ports/Mk/bsd.port.mk ifeq ($(threads),1) -LDFLAGS += -pthread -CFLAGS += -D_THREAD_SAFE +RET = $(shell test $(OSVERSION) -lt 500016 && printf 1) +ifeq ($(RET),1) + PTHREAD_CFLAGS = -D_THREAD_SAFE + PTHREAD_LIBS = -pthread +else + PTHREAD_CFLAGS = -D_THREAD_SAFE + PTHREAD_LIBS = -lc_r +endif # RET + +CFLAGS += $(PTHREAD_CFLAGS) +LDFLAGS += $(PTHREAD_LIBS) + endif # threads # Test for template instantiation, add to SOFLAGS if SONAME set, |