summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcls%seawood.org <devnull@localhost>2005-06-01 14:26:29 +0000
committercls%seawood.org <devnull@localhost>2005-06-01 14:26:29 +0000
commitf71bcacee0fef7e76115752a25864c207bae94c3 (patch)
treec8493d3eac0b6a07c759b02019037822cf8e50dc
parent0b270d4b837280fd6d036384c5f485ed3ce29d40 (diff)
downloadnspr-hg-f71bcacee0fef7e76115752a25864c207bae94c3.tar.gz
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
-rw-r--r--config/Makefile.in2
-rw-r--r--lib/ds/Makefile.in2
-rw-r--r--lib/libc/src/Makefile.in2
-rw-r--r--lib/msgc/src/Makefile.in2
-rw-r--r--lib/prstreams/Makefile.in2
-rw-r--r--pr/src/Makefile.in2
-rw-r--r--pr/tests/dll/Makefile.in2
7 files changed, 7 insertions, 7 deletions
diff --git a/config/Makefile.in b/config/Makefile.in
index 7a1ccbd9..890f8c6b 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -128,7 +128,7 @@ endif
OUTOPTION = -o # end of the line
ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))
ifndef NS_USE_GCC
-OUTOPTION = /Fe
+OUTOPTION = -Fe
endif
endif
diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in
index 516e1a37..2916ab70 100644
--- a/lib/ds/Makefile.in
+++ b/lib/ds/Makefile.in
@@ -66,7 +66,7 @@ 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
diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in
index 162b3ed9..fcdbae60 100644
--- a/lib/libc/src/Makefile.in
+++ b/lib/libc/src/Makefile.in
@@ -76,7 +76,7 @@ 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
diff --git a/lib/msgc/src/Makefile.in b/lib/msgc/src/Makefile.in
index e822fc29..de834cc5 100644
--- a/lib/msgc/src/Makefile.in
+++ b/lib/msgc/src/Makefile.in
@@ -72,7 +72,7 @@ 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
diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in
index 5c1311b2..679c03d9 100644
--- a/lib/prstreams/Makefile.in
+++ b/lib/prstreams/Makefile.in
@@ -88,7 +88,7 @@ CXXSRCS = \
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
diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in
index 1c6e1fa9..cf2f5229 100644
--- a/pr/src/Makefile.in
+++ b/pr/src/Makefile.in
@@ -319,7 +319,7 @@ 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
diff --git a/pr/tests/dll/Makefile.in b/pr/tests/dll/Makefile.in
index 62a214f4..906f5310 100644
--- a/pr/tests/dll/Makefile.in
+++ b/pr/tests/dll/Makefile.in
@@ -71,7 +71,7 @@ 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