summaryrefslogtreecommitdiff
path: root/config/WIN32.mk
diff options
context:
space:
mode:
Diffstat (limited to 'config/WIN32.mk')
-rw-r--r--config/WIN32.mk10
1 files changed, 2 insertions, 8 deletions
diff --git a/config/WIN32.mk b/config/WIN32.mk
index 375c80c3..238915f9 100644
--- a/config/WIN32.mk
+++ b/config/WIN32.mk
@@ -26,7 +26,7 @@
# flipped, so that gmake won't interpret them as escape characters.
#
ifdef PR_CLIENT_BUILD_WINDOWS
-SHELL = $(MOZ_TOOLS_FLIPPED)/bin/shmsdos.exe
+SHELL := $(MOZ_TOOLS_FLIPPED)/bin/shmsdos.exe
endif
CC = cl
@@ -35,6 +35,7 @@ LINK = link
AR = lib -NOLOGO -OUT:"$@"
RANLIB = echo
BSDECHO = echo
+STRIP = echo
NSINSTALL = nsinstall
INSTALL = $(NSINSTALL)
define MAKE_OBJDIR
@@ -53,14 +54,7 @@ OS_CFLAGS = -W3 -nologo -GF -Gy
ifdef BUILD_OPT
OS_CFLAGS += -MD
-# The -O2 optimization of MSVC 6.0 SP3 appears to generate
-# code that is unsafe for our use of fibers and static thread
-# local storage. We temporarily work around this problem by
-# turning off global optimizations (-Og).
OPTIMIZER = -O2
-ifeq ($(OS_TARGET),WINNT)
-OPTIMIZER += -Og-
-endif
DEFINES = -UDEBUG -U_DEBUG -DNDEBUG
DLLFLAGS = -OUT:"$@"
OBJDIR_TAG = _OPT