summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc%netscape.com <devnull@localhost>1999-07-01 23:19:52 +0000
committerwtc%netscape.com <devnull@localhost>1999-07-01 23:19:52 +0000
commit6f76beadbf9ffab418558f901f6c4f8e7856ad23 (patch)
treecdc50ab10f0ee465cff26b69f3572dc6713ff5f1
parent55f2a60a7ea7eacdeaa0e3048159e6e12c44b309 (diff)
downloadnspr-hg-6f76beadbf9ffab418558f901f6c4f8e7856ad23.tar.gz
Bugzilla bug #9155: use -library=iostream so that Sun Workshop
5.0 can work with old style iostreams. Thanks to Tim McNerney <mumbly@netcom.com> for suggesting this fix.
-rw-r--r--lib/prstreams/Makefile10
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/prstreams/Makefile b/lib/prstreams/Makefile
index 0fe73149..b0f53ca6 100644
--- a/lib/prstreams/Makefile
+++ b/lib/prstreams/Makefile
@@ -25,6 +25,16 @@ include $(MOD_DEPTH)/config/config.mk
ifeq ($(OS_ARCH),SunOS)
ifeq ($(OS_RELEASE),4.1.3_U1)
OPTIMIZER =
+ else
+ # The C++ compiler in Workshop 5.0 uses standard
+ # iostreams as default. -library=iostream will
+ # allow Workshop 5.0 to work with classic iostreams.
+ ifndef NS_USE_GCC
+ CCC_VERSION := $(shell $(CCC) -V 2>&1)
+ ifneq (,$(findstring 5.0,$(CCC_VERSION)))
+ CCC_ONLY_FLAGS += -library=iostream
+ endif
+ endif
endif
endif