Use dashes instead of backslashes for program options to avoid msys shell expansion.
authorcls%seawood.org
Wed, 01 Jun 2005 14:28:35 +0000
changeset 3400 fc5d45e4420450ab1a507eb937ee797be244082c
parent 3397 704b1f9a67c5919af8bcd90b94f32a908291958b
child 3402 6db05ec485c27f3ba1fe5d881d700c99b14974f3
push idunknown
push userunknown
push dateunknown
bugs294122
Use dashes instead of backslashes for program options to avoid msys shell expansion. Thanks to Howard Chu <hyc@symas.com> for the patch. Bug #294122 r=cls a=shaver
config/Makefile.in
lib/ds/Makefile.in
lib/libc/src/Makefile.in
lib/msgc/src/Makefile.in
lib/prstreams/Makefile.in
pr/src/Makefile.in
pr/tests/dll/Makefile.in
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -123,17 +123,17 @@ TARGETS = $(PROGS)
 else
 PROGS	+= $(OBJDIR)/nsinstall$(PROG_SUFFIX)
 TARGETS = $(PROGS) $(PLSRCS:.pl=)
 endif
 
 OUTOPTION = -o # end of the line
 ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))
 ifndef NS_USE_GCC
-OUTOPTION = /Fe
+OUTOPTION = -Fe
 endif
 endif
 
 # Redefine MAKE_OBJDIR for just this directory
 define MAKE_OBJDIR
 if test ! -d $(@D); then rm -rf $(@D); mkdir $(@D); else true; fi
 endef
 
--- a/lib/ds/Makefile.in
+++ b/lib/ds/Makefile.in
@@ -61,17 +61,17 @@ HEADERS = \
 	$(NULL)
 
 HEADERS := $(addprefix $(srcdir)/, $(HEADERS))
 
 ifeq ($(OS_ARCH), WINNT)
 ifdef NS_USE_GCC
 DLLBASE=-Wl,--image-base -Wl,0x30000000
 else
-DLLBASE=/BASE:0x30000000
+DLLBASE=-BASE:0x30000000
 endif # GCC
 RES=$(OBJDIR)/plds.res
 RESNAME=plds.rc
 endif # WINNT
 
 ifeq ($(OS_ARCH), AIX)
 ifeq ($(CLASSIC_NSPR),1)
 OS_LIBS = -lc
--- a/lib/libc/src/Makefile.in
+++ b/lib/libc/src/Makefile.in
@@ -71,17 +71,17 @@ LIBRARY_NAME	= plc
 LIBRARY_VERSION	= $(MOD_MAJOR_VERSION)
 
 RELEASE_LIBS = $(TARGETS)
 
 ifeq ($(OS_ARCH),WINNT)
 ifdef NS_USE_GCC
 DLLBASE=-Wl,--image-base -Wl,0x30000000
 else
-DLLBASE=/BASE:0x30000000
+DLLBASE=-BASE:0x30000000
 endif
 RES=$(OBJDIR)/plc.res
 RESNAME=plc.rc
 endif # WINNT
 
 ifeq ($(OS_ARCH), AIX)
 ifeq ($(CLASSIC_NSPR),1)
 OS_LIBS = -lc
--- a/lib/msgc/src/Makefile.in
+++ b/lib/msgc/src/Makefile.in
@@ -67,17 +67,17 @@ EXTRA_LIBS = $(LIBNSPR)
 ifdef RESOLVE_LINK_SYMBOLS
 EXTRA_LIBS += $(OS_LIBS)
 endif
 
 ifeq ($(OS_ARCH), WINNT)
 ifdef NS_USE_GCC
 DLLBASE=-Wl,--image-base -Wl,0x30000000
 else
-DLLBASE=/BASE:0x30000000
+DLLBASE=-BASE:0x30000000
 endif # GCC
 #RES=$(OBJDIR)/ds.res
 #RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc
 #OS_LIBS = user32.lib
 endif # WINNT
 
 LIBRARY_NAME = msgc
 LIBRARY_VERSION = $(MOD_MAJOR_VERSION)
--- a/lib/prstreams/Makefile.in
+++ b/lib/prstreams/Makefile.in
@@ -83,17 +83,17 @@ CSRCS = \
 
 CXXSRCS = \
 	prstrms.cpp \
 	$(NULL)
 
 OBJS = $(addprefix $(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX)) $(CXXSRCS:.cpp=.$(OBJ_SUFFIX)))
 
 ifeq ($(OS_ARCH), WINNT)
-        DLLBASE=/BASE:0x30000000
+        DLLBASE=-BASE:0x30000000
         RES=$(OBJDIR)/prstrms.res
         RESNAME=prstrms.rc
         OS_LIBS = user32.lib
 else
     ifeq ($(OS_ARCH),OS2)
       ifneq ($(MOZ_OS2_TOOLS),VACPP)
          OS_LIBS = -lstdcpp
       endif
--- a/pr/src/Makefile.in
+++ b/pr/src/Makefile.in
@@ -314,17 +314,17 @@ endif
 ifdef GC_LEAK_DETECTOR
 OBJS += memory/$(OBJDIR)/prgcleak.$(OBJ_SUFFIX)
 endif
 
 ifeq ($(OS_ARCH), WINNT)
 ifdef NS_USE_GCC
 DLLBASE=-Wl,--image-base -Wl,0x30000000
 else
-DLLBASE=/BASE:0x30000000
+DLLBASE=-BASE:0x30000000
 endif # GCC
 RES=$(OBJDIR)/nspr.res
 RESNAME=nspr.rc
 endif # WINNT
 
 include $(srcdir)/md/$(PR_MD_ARCH_DIR)/objs.mk
 ifdef USE_BTHREADS
 include $(srcdir)/bthreads/objs.mk
--- a/pr/tests/dll/Makefile.in
+++ b/pr/tests/dll/Makefile.in
@@ -66,17 +66,17 @@ endif
 
 ifeq ($(OS_ARCH), WINNT)
 ifeq ($(OS_TARGET), WIN16)
 # do nothing
 else
 ifdef NS_USE_GCC
 DLLBASE=-Wl,--image-base -Wl,0x30000000
 else
-DLLBASE=/BASE:0x30000000
+DLLBASE=-BASE:0x30000000
 endif
 RES=$(OBJDIR)/my.res
 RESNAME=../../../pr/src/nspr.rc
 endif
 endif
 
 ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
 IMPORT_LIBRARY	= $(OBJDIR)/my.$(LIB_SUFFIX)