summaryrefslogtreecommitdiff
path: root/ACE/include/makeinclude/platform_openbsd.GNU
diff options
context:
space:
mode:
authorolli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-09-14 06:54:00 +0000
committerolli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-09-14 06:54:00 +0000
commitaa36292a2b09301dd23fe13fe0623054c96b1888 (patch)
tree52a233cfecf75683df8819b562c24a0a1519295b /ACE/include/makeinclude/platform_openbsd.GNU
parent5cb62bcac1d15ddd6cb7ecd708f8bd507ebfedc7 (diff)
downloadATCD-aa36292a2b09301dd23fe13fe0623054c96b1888.tar.gz
ChangeLogTag: Mon Sep 14 06:47:31 UTC 2009 Olli Savia <ops@iki.fi>
Diffstat (limited to 'ACE/include/makeinclude/platform_openbsd.GNU')
-rw-r--r--ACE/include/makeinclude/platform_openbsd.GNU16
1 files changed, 4 insertions, 12 deletions
diff --git a/ACE/include/makeinclude/platform_openbsd.GNU b/ACE/include/makeinclude/platform_openbsd.GNU
index 9c061346d32..b525e63dde5 100644
--- a/ACE/include/makeinclude/platform_openbsd.GNU
+++ b/ACE/include/makeinclude/platform_openbsd.GNU
@@ -25,38 +25,30 @@ 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
ifeq ($(threads),1)
-LDFLAGS += -pthread
-CFLAGS += -D_THREAD_SAFE -DACE_HAS_THREADS
+ LDFLAGS += -pthread
+ CFLAGS += -D_THREAD_SAFE -DACE_HAS_THREADS
endif # threads
PLATFORM_X11_CPPFLAGS=-I/usr/X11R6/include
PLATFORM_X11_LIBS=-lX11
PLATFORM_X11_LDFLAGS=-L/usr/X11R6/lib
-PLATFORM_TK_CPPFLAGS=$(shell . /usr/local/lib/tk*/tkConfig.sh && echo -n $$TK_INCLUDE_SPEC $$TK_DEFS) $(PLATFORM_X11_CPPFLAGS)
+PLATFORM_TK_CPPFLAGS=$(shell . /usr/local/lib/tk*/tkConfig.sh && echo -n $$TK_INCLUDE_SPEC) $(PLATFORM_X11_CPPFLAGS)
PLATFORM_TK_LIBS=$(shell . /usr/local/lib/tk*/tkConfig.sh && echo -n $$TK_LIB_FLAG) $(PLATFORM_X11_LIBS)
PLATFORM_TK_LDFLAGS=$(PLATFORM_X11_LDFLAGS)
-PLATFORM_TCL_CPPFLAGS=$(shell . /usr/local/lib/tcl*/tclConfig.sh && echo -n $$TCL_INCLUDE_SPEC $$TCL_DEFS)
+PLATFORM_TCL_CPPFLAGS=$(shell . /usr/local/lib/tcl*/tclConfig.sh && echo -n $$TCL_INCLUDE_SPEC)
PLATFORM_TCL_LIBS=$(shell . /usr/local/lib/tcl*/tclConfig.sh && echo -n $$TCL_LIB_FLAG)
PLATFORM_TCL_LDFLAGS=
-# Setting the internal name and version of shared libraries isn't supported
-# by OpenBSD. In fact, the -h option gives an error and interestingly
-# enough, the -soname option doesn't but just ignores its parameter.
-# This tells platform_g++_common.GNU not to add these link options.
-with_ld = openbsd
-
# Test for template instantiation, add to SOFLAGS if versioned_so set,
# add -E to LDFLAGS if using GNU ld
#
include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG)
-