summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc <devnull@localhost>1998-05-08 18:32:30 +0000
committerwtc <devnull@localhost>1998-05-08 18:32:30 +0000
commit69d90b44a00a163edddbd7961dd265bfcb794f3e (patch)
treef6efff6ae0f2b1ddf3661479f546975d209b7760
parent6f8d39fed2f7d680567abf0c8987679c2a729fba (diff)
downloadnspr-hg-69d90b44a00a163edddbd7961dd265bfcb794f3e.tar.gz
Merged patches contributed by Matt Watson <mwatson@apple.com>.
-rw-r--r--config/Rhapsody.mk12
1 files changed, 5 insertions, 7 deletions
diff --git a/config/Rhapsody.mk b/config/Rhapsody.mk
index 3a9c3dba..ba42c459 100644
--- a/config/Rhapsody.mk
+++ b/config/Rhapsody.mk
@@ -16,7 +16,7 @@
#
#
-# Config stuff for Rhapsody5.0
+# Config stuff for Rhapsody
#
include $(MOD_DEPTH)/config/UNIX.mk
@@ -41,18 +41,16 @@ CPU_ARCH = ppc
# 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++