Merged patches contributed by Matt Watson <mwatson@apple.com>.
Merged patches contributed by Matt Watson <mwatson@apple.com>.
--- a/config/Rhapsody.mk
+++ b/config/Rhapsody.mk
@@ -11,17 +11,17 @@
#
# The Initial Developer of this code under the NPL is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
#
-# Config stuff for Rhapsody5.0
+# Config stuff for Rhapsody
#
include $(MOD_DEPTH)/config/UNIX.mk
CC = cc
CCC = cc++
RANLIB = ranlib
@@ -36,23 +36,21 @@ CPU_ARCH = ppc
# The meaning of a common is ambiguous. It may be a true definition:
# int x = 0;
# or it may be a declaration of a symbol defined in another file:
# extern int x;
# Use the -fno-common option to force all commons to become true
# definitions so that the linker can catch multiply-defined symbols.
# Also, common symbols are not allowed with Rhapsody dynamic libraries.
-OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -fno-common -pipe -DRHAPSODY -DHAVE_STRERROR -DHAVE_BSD_FLOCK
+OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wmost -fno-common -pipe -DRHAPSODY -DHAVE_STRERROR -DHAVE_BSD_FLOCK
DEFINES += -D_PR_LOCAL_THREADS_ONLY -D_PR_NEED_FAKE_POLL
ARCH = rhapsody
-#DSO_CFLAGS = -fPIC
-#DSO_LDOPTS = -Bshareable
-#DSO_LDFLAGS =
+# May override this with -bundle to create a loadable module.
+DSO_LDOPTS = -dynamiclib
-# Do we need this?: -install_name
-MKSHLIB = $(CC) -arch ppc -dynamiclib -compatibility_version 1 -current_version 1 -all_load
+MKSHLIB = $(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS)
DLL_SUFFIX = dylib
#G++INCLUDES = -I/usr/include/g++