1 files changed, 11 insertions, 6 deletions
diff --git a/config/Rhapsody.mk b/config/Rhapsody.mk
index 7f3c9116..afc1352e 100644
--- a/config/Rhapsody.mk
+++ b/config/Rhapsody.mk
@@ -21,12 +21,19 @@
 
 include $(MOD_DEPTH)/config/UNIX.mk
 
-CC              = cc
-ifeq ($(OS_RELEASE),5.0)
-CCC             = cc++
+#
+# The default implementation strategy for Rhapsody is pthreads.
+#
+ifeq ($(CLASSIC_NSPR),1)
+IMPL_STRATEGY   = _EMU
+DEFINES         += -D_PR_LOCAL_THREADS_ONLY
 else
-CCC             = c++
+USE_PTHREADS    = 1
+IMPL_STRATEGY   = _PTH
 endif
+
+CC              = cc
+CCC             = c++
 RANLIB			= ranlib
 
 ifeq (86,$(findstring 86,$(OS_TEST)))
@@ -49,8 +56,6 @@ endif
 
 OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wmost -fno-common -pipe -DRHAPSODY -DHAVE_STRERROR -DHAVE_BSD_FLOCK
 
-DEFINES			+= -D_PR_LOCAL_THREADS_ONLY
-
 ARCH			= rhapsody
 
 # May override this with -bundle to create a loadable module.