diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/makeinclude/platform_aix4_cset++.GNU | 25 | ||||
| -rw-r--r-- | include/makeinclude/rules.lib.GNU | 19 |
2 files changed, 23 insertions, 21 deletions
diff --git a/include/makeinclude/platform_aix4_cset++.GNU b/include/makeinclude/platform_aix4_cset++.GNU index 44ef5396f7b..429d64a354e 100644 --- a/include/makeinclude/platform_aix4_cset++.GNU +++ b/include/makeinclude/platform_aix4_cset++.GNU @@ -1,8 +1,18 @@ # $Id$ -# AIX 4.x using the C Set++ compiler. +# AIX 4.x using the IBM C Set++ compiler. # *not* using Orbix # +# NOTE! IBM is no longer supporting AIX at any version earlier than 4.3, +# and Riverace is not testing or supporting ACE on them either. No steps +# have been taken to intentionally disable anything, but it is not being +# tested either. +# +# NOTE 2! This file is only for use with the older CSet++ compiler, which +# IBM doesn't sell or support any longer. Riverace doesn't support ACE +# with it either. This file is still here in case there is some site +# still using the old compiler, but it is completely unsupported. +# # On 4.1, this file assumes that the user has installed the AIX patch # containing the dl*() APIs. To use these APIs, IBM has created a # separate product (free to AIX licensees) called shared library @@ -42,6 +52,12 @@ endif AIX_MAJOR_VERS := $(shell uname -v) AIX_MINOR_VERS := $(shell uname -r) +# aix_build turns on the funky shared library building code. +aix_build = 1 +# ibmcxx_build turns on the extra step for instantiating and compiling +# template instances. +ibmcxx_build = 1 + ifeq ($(threads),1) CC = xlc_r CXX = xlC_r @@ -77,13 +93,9 @@ CPPFLAGS += -qlanglvl=ansi -DACE_AIX_MAJOR_VERS=$(AIX_MAJOR_VERS) -DACE_AIX_M # Process_Strategy_Test went CPU bound in ostream, so I removed it (S. Huston) DCFLAGS += -g -qcheck=nobounds:div:null +ACELIB = -lACE LD = $(CXX) -ifeq ($(shared_libs),1) -ACELIB = -lACEshr -SHLIBA = $(SHLIB:lib%.so=lib%shr.a) -endif - ifeq ($(AIX_MINOR_VERS),1) LLIBS = -lsvld -ltli_r $(ACELIB) LIBS += $(filter-out $(SHLIBA:lib%.a=-l%), $(LLIBS)) @@ -104,4 +116,3 @@ OCCFLAGS += -O2 -qarch=com RANLIB = ranlib SOFLAGS = -p 0 TEMPINCDIR = tempinc -SOBUILD = diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU index ddc6eabf0d9..ab57d5df40f 100644 --- a/include/makeinclude/rules.lib.GNU +++ b/include/makeinclude/rules.lib.GNU @@ -100,8 +100,8 @@ ifeq (1,$(ace_lib_prelink)) -$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $? $(LDFLAGS) $(ACE_NUL_STDERR) endif # ace_lib_prelink $(AR) $(ARFLAGS) $@ $? -ifdef TEMPINCDIR -# This is required to get AIX xlC to instantiate and compile the needed +ifdef ibmcxx_build +# This is required to get AIX IBM C/C++ to instantiate and compile the needed # templates. if test -s ./$(TEMPINCDIR)/*.C; \ then \ @@ -135,8 +135,8 @@ endif # SHLIBBUILD ifdef PRELIB $(PRELIB) endif -ifdef TEMPINCDIR -# This is required to get AIX xlC to instantiate and compile the needed +ifdef ibmcxx_build +# This is required to get AIX IBM C/C++ to instantiate and compile the needed # templates before building the library. if test -s ./$(TEMPINCDIR)/*.C; \ then \ @@ -147,7 +147,7 @@ endif ifdef SHLIBBUILD $(SHLIBBUILD) else -ifdef TEMPINCDIR +ifdef ibmcxx_build if test -s ./$(TEMPINCDIR)/*.$(OBJEXT); \ then \ $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $(VSHOBJS1) $(TEMPINCDIR)/*.$(OBJEXT) $(LDFLAGS) $(ACE_SHLIBS) $(LIBS); \ @@ -168,12 +168,3 @@ endif endif -chmod a+rx $@ endif - -ifdef SHLIBA -$(SHLIBA): $(VSHLIB) - $(AR) $(ARFLAGS) $@ $? - -chmod a+rx $@ -ifneq (,$(RANLIB)) - -$(RANLIB) $@ -endif # RANLIB -endif |