diff options
| -rw-r--r-- | ACE-INSTALL.html | 3 | ||||
| -rw-r--r-- | include/makeinclude/platform_sunos5_sunc++.GNU | 9 | ||||
| -rw-r--r-- | include/makeinclude/wrapper_macros.GNU | 9 |
3 files changed, 16 insertions, 5 deletions
diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html index 18a44c418ee..5794d9711d6 100644 --- a/ACE-INSTALL.html +++ b/ACE-INSTALL.html @@ -1335,7 +1335,8 @@ static_libs Build shared libraries. Ignored if shared_libs_only is set. shared_libs_only Only build shared libraries. Ignored if no SHLIBs are specified by the Makefile, as in performance-tests/Misc. static_libs_only Only build static libraries. -xt_reactor Build the XtReactor +threads Build with thread support. +xt_reactor Build the XtReactor. Usually, users do not need to be concerned with make targets. Just enter ``make'' on the command line to build. A few notable diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU index c5739f8ac6d..1af5e1b4483 100644 --- a/include/makeinclude/platform_sunos5_sunc++.GNU +++ b/include/makeinclude/platform_sunos5_sunc++.GNU @@ -17,10 +17,15 @@ # There should be no other warnings from Sun C++ when building ACE. debug = 1 +threads = 1 + +ifeq ($(threads),1) + CFLAGS += -mt + LDFLAGS += -mt +endif # threads CC = cc CXX = CC -CFLAGS += -mt #### -pta instantiates all template members, which makes libraries bigger. #### But, it's supposed to put each member into it's own .o, so executable #### size should not be penalized. @@ -60,7 +65,7 @@ else LIBS += -lsocket -ldl -lnsl -lgen -lposix4 endif # orbix -LDFLAGS += -mt -xildoff +LDFLAGS += -xildoff OCFLAGS += -O PIC = -PIC diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU index 6ef1c280526..670ffb07112 100644 --- a/include/makeinclude/wrapper_macros.GNU +++ b/include/makeinclude/wrapper_macros.GNU @@ -37,7 +37,8 @@ # shared_libs_only Only build shared libraries. Ignored if no SHLIBs are # specified by the Makefile, as in performance-tests/Misc. # static_libs_only Only build static libraries. -# xt_reactor Build the XtReactor +# threads Build with thread support. +# xt_reactor Build the XtReactor. # # Usually, users do not need to be concerned with make targets. # Just enter "make" on the command line to build. A few notable @@ -201,6 +202,10 @@ else CCFLAGS += $(DCCFLAGS) endif # debug +ifeq ($(threads),0) + override threads = +endif # threads + ifeq ($(xt_reactor),0) override xt_reactor = endif # xt_reactor @@ -209,7 +214,7 @@ ifneq ($(xt_reactor),) CPPFLAGS += -DACE_HAS_XT $(PLATFORM_XT_CPPFLAGS) LIBS += $(PLATFORM_XT_LIBS) LDFLAGS += $(PLATFORM_XT_LDFLAGS) -endif # debug +endif # xt_reactor ifdef exceptions CCFLAGS += -DACE_HAS_EXCEPTIONS |