Bug 366398: Makefile.ref on Darwin builds dynamic library correctly, and a fix for debug builds

js/src/config/Darwin.mk

@@ -49,7 +49,9 @@ CFLAGS +=  -Wall -Wno-format
 OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DDARWIN
 
 RANLIB = ranlib
-MKSHLIB = libtool $(XMKSHLIBOPTS) -framework System
+MKSHLIB = $(CC) -dynamiclib $(XMKSHLIBOPTS) -framework System
+
+SO_SUFFIX = dylib
 
 #.c.o:
 #      $(CC) -c -MD $*.d $(CFLAGS) $<

js/src/jsatom.c

@@ -940,8 +940,8 @@ js_map_atom(JSHashEntry *he, intN i, void *arg)
 }
 
 #ifdef DEBUG
-jsrefcount js_atom_map_count;
-jsrefcount js_atom_map_hash_table_count;
+static jsrefcount js_atom_map_count;
+static jsrefcount js_atom_map_hash_table_count;
 #endif
 
 JS_FRIEND_API(JSBool)