From 178aa1b8b0e0e38f9f52b0dac6ee012dc7f2a7e5 Mon Sep 17 00:00:00 2001
From: nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>
Date: Wed, 26 May 1999 07:00:23 +0000
Subject: Consolidated the two freebsd platform macro files.

---
 include/makeinclude/platform_freebsd.GNU | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'include/makeinclude/platform_freebsd.GNU')

diff --git a/include/makeinclude/platform_freebsd.GNU b/include/makeinclude/platform_freebsd.GNU
index 5b1e56f6ad8..22d55069f0e 100644
--- a/include/makeinclude/platform_freebsd.GNU
+++ b/include/makeinclude/platform_freebsd.GNU
@@ -2,27 +2,37 @@
 
 # platform_freebsd.GNU
 
-# ***** Notice: This file is still under testing. *****
-# To be used on FreeBSD platform without pthread support.
+#####################################################
+# Replace 3 with 2 if you are running FreeBSD 2.x.x
+#  ** How do we detect os version here?
+#####################################################
+VERSION = 3
 
-debug = 1
-optimize = 1
+ifneq ($(VERSION),3)
 versioned_so = 1
+endif
+
+optimize = 1
+
+debug = 1
 
 CC              = gcc
 CXX		= g++
-CFLAGS          += -w -fno-strict-prototypes
+CFLAGS          += -Wall -Wpointer-arith -pipe
 CCFLAGS         += $(CFLAGS) -fno-implicit-templates
 DCFLAGS         += -g
-DLD             = ld
+ifeq ($(VERSION),3)
+  LDFLAGS		+= -Wl,-rpath $(ACE_ROOT)/ace
+endif
+DLD             = $(CXX)
 LD		= $(CXX)
-LIBS            += -lstdc++ -lcompat
+LIBS            += -lstdc++
 OCFLAGS         += -O2
-PIC             = -fpic -DPIC
+PIC             = -fpic
 AR              = ar
 ARFLAGS         = ruv
 RANLIB          = ranlib
 
-SOFLAGS = -Bshareable -x /usr/lib/c++rt0.o
+SOFLAGS = $(CPPFLAGS) -shared
 SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
 PRELIB = @echo
-- 
cgit v1.2.1