summaryrefslogtreecommitdiff
path: root/include/makeinclude
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>1997-06-12 14:53:51 +0000
committerSteve Huston <shuston@riverace.com>1997-06-12 14:53:51 +0000
commita18324ca9b901a9131926dab37c3a6ba568ec1fb (patch)
tree8cc691edc390f6261889aeb455dbbefe256b8a13 /include/makeinclude
parent608e3296175520804a210b978bd05c3fcff8f5f8 (diff)
downloadATCD-a18324ca9b901a9131926dab37c3a6ba568ec1fb.tar.gz
Changed to build using HP-recommended template instantiation procedures
for aC++.
Diffstat (limited to 'include/makeinclude')
-rw-r--r--include/makeinclude/platform_hpux_aCC.GNU27
1 files changed, 19 insertions, 8 deletions
diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU
index d680f791b54..3d4a45722f9 100644
--- a/include/makeinclude/platform_hpux_aCC.GNU
+++ b/include/makeinclude/platform_hpux_aCC.GNU
@@ -1,20 +1,31 @@
+# This is for the HP-UX aC++ compiler. Most of the difference for threaded
+# vs. non-threaded is contained in ace/config-hpux-10.x.h. However, there
+# is a line to verify in this file - if you are using DCE threads, "-lcma"
+# needs to be on the SHLIBBUILD line, below. If you are not using DCE threads,
+# then use the SHLIBBUILD without -lcma.
CC = /bin/cc
CXX = /opt/aCC/bin/aCC
CFLAGS += $(DCFLAGS)
CCFLAGS += $(CFLAGS)
-DCFLAGS += -g
+DCFLAGS += -g -D_THREAD_SAFE -D_REENTRANT
DLD = $(CXX)
LD = $(CXX)
PIC = +Z
ARFLAGS = ruv
RANLIB = echo
-LDFLAGS = -L$(WRAPPER_ROOT)/ace -Wl,+s
-LIBS += -lxti
-SOFLAGS = -b
+LDFLAGS = -Wl,+s
+#LIBS +=
+PRELIB = $(CXX) -c +inst_close $^
+PRELIB_USES_OBJ_ONLY = 1
+SOFLAGS = -b +inst_none
SOEXT = sl
-SHLIBBUILD = $(SOLINK.cc) -o $@ $(VSHOBJS1)
+SHLIBBUILD = $(SOLINK.cc) -o $@ $(VSHOBJS) $(LDFLAGS) -lxti -lcma
+#SHLIBBUILD = $(SOLINK.cc) -o $@ $(VSHOBJS) $(LDFLAGS) -lxti
SOBUILD = @echo ""; \
echo "$(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<"; \
- $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
- echo "$(SOLINK.cc) -o $@ ./$(VSHDIR)$*.o"; \
- $(SOLINK.cc) -o $@ ./$(VSHDIR)$*.o
+ $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<
+
+# No need to instantiate templates in each .o file - wait and do all of
+# them at once with +inst_close
+# echo "$(SOLINK.cc) -o $@ ./$(VSHDIR)$*.o"; \
+# $(SOLINK.cc) -o $@ ./$(VSHDIR)$*.o