changes to build on Mac OS X, r=mccabe

js/src/Makefile.ref

@@ -68,7 +68,12 @@ endif
 # XCFLAGS may be set in the environment or on the gmake command line
 #
 CFLAGS          += $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS)
-LDFLAGS		= -lm $(XLDFLAGS)
+
+LDFLAGS		= $(XLDFLAGS)
+
+ifndef NO_LIBM
+LDFLAGS += -lm
+endif
 
 #
 # Ask perl what flags it was built with, so we can build js with similar flags

js/src/config.mk

@@ -5,7 +5,7 @@ DIST = $(DEPTH)/../../dist/$(OBJDIR)
 endif
 
 # Set os+release dependent make variables
-OS_ARCH         := $(subst /,_,$(shell uname -s))
+OS_ARCH         := $(subst /,_,$(shell uname -s | sed /\ /s//_/))
 
 # Attempt to differentiate between SunOS 5.4 and x86 5.4
 OS_CPUARCH      := $(shell uname -m)

js/src/fdlibm/k_standard.c

@@ -48,7 +48,7 @@
 #include "fdlibm.h"
 
 /* XXX ugly hack to get msvc to link without error. */
-#if _LIB_VERSION == _IEEE_
+#if _LIB_VERSION == _IEEE_ && !defined(RHAPSODY)
    int errno;
 #  define EDOM 0
 #  define ERANGE 0