diff --git a/mozilla/js/src/Makefile.in b/mozilla/js/src/Makefile.in
index 0be0781d9ca..33409e71584 100644
--- a/mozilla/js/src/Makefile.in
+++ b/mozilla/js/src/Makefile.in
@@ -182,17 +182,6 @@ GARBAGE		+= $(JSMATH_PRELINK) jscpucfg.o jsautocfg.h jsautocfg.tmp jscpucfg
 
 TARGETS		+= jscpucfg
 
-ifneq ($(findstring -L,$(NSPR_LIBS)),)
-NSPR_STATIC_PATH = $(subst -L,,$(findstring -L,$(NSPR_LIBS)))
-else
-NSPR_STATIC_PATH = $(DIST)/lib
-endif
-
-LDFLAGS		= $(pathsubst -l%,$(NSPR_STATIC_PATH)/%.a,$(NSPR_LIBS))
-ifneq ($(OS_ARCH),BeOS)
-LDFLAGS		+= -lm
-endif
-
 ifdef JS_SAFE_ARENA
 DEFINES		+= -DJS_USE_SAFE_ARENA
 endif
@@ -209,6 +198,18 @@ ifdef JS_VERSION
 DEFINES		+= -DJS_VERSION=$(JS_VERSION)
 endif
 
+ifneq ($(findstring -L,$(NSPR_LIBS)),)
+NSPR_STATIC_PATH = $(subst -L,,$(findstring -L,$(NSPR_LIBS)))
+else
+NSPR_STATIC_PATH = $(DIST)/lib
+endif
+
+LDFLAGS		= $(pathsubst -l%,$(NSPR_STATIC_PATH)/%.a,$(NSPR_LIBS))
+
+ifneq ($(OS_ARCH),BeOS)
+LDFLAGS		+= -lm
+endif
+
 ifeq ($(OS_ARCH),FreeBSD)
 LDFLAGS		+= -pthread
 endif
@@ -224,13 +225,6 @@ endif
 ifeq ($(OS_ARCH),OSF1)
 LDFLAGS		+= -lc_r
 endif
-ifeq ($(OS_ARCH),QNX)
-ifeq ($(OS_TARGET),NTO)
-DASH_R		= -r
-else
-DASH_R		=
-endif
-endif
 ifeq ($(OS_ARCH),SunOS)
 ifeq ($(CPU_ARCH),sparc)
 
@@ -256,10 +250,25 @@ LDFLAGS		+= -lposix4 -ldl -lnsl -lsocket
 endif
 endif
 
+ifeq ($(OS_ARCH),QNX)
+ifneq ($(OS_TARGET),NTO)
+# Don't use wildcard here, because we only want this resolved at link time.
+OBJS		+= fdlibm/*.o
+endif
+endif
+
 # special rule for jsmath.o since we want to incrementally link
 # against fdlibm to pull in only what is needed
 jsmath.o: $(FDLIBM_LIBRARY) $(JSMATH_PRELINK)
+ifeq ($(OS_ARCH),QNX)
+ifneq ($(OS_TARGET),NTO)
+	@cp $(JSMATH_PRELINK) $@
+else
 	$(LD) $(DASH_R) -o $@ $(JSMATH_PRELINK) $(FDLIBM_LIBRARY)
+endif
+else
+	$(LD) $(DASH_R) -o $@ $(JSMATH_PRELINK) $(FDLIBM_LIBRARY)
+endif
 
 $(JSMATH_PRELINK): jsmath.c
 ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))