Skip to content

Commit

Permalink
Bug 1043082: add the USE_STATIC_RTL makefile variable. r=ehsan.
Browse files Browse the repository at this point in the history
  • Loading branch information
wantehchang committed Aug 8, 2014
1 parent 36b44dd commit 409ea97
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 10 deletions.
3 changes: 3 additions & 0 deletions Makefile
Expand Up @@ -73,6 +73,9 @@ endif
ifdef USE_DEBUG_RTL
NSPR_CONFIGURE_OPTS += --enable-debug-rtl
endif
ifdef USE_STATIC_RTL
NSPR_CONFIGURE_OPTS += --enable-static-rtl
endif
ifdef NS_USE_GCC
NSPR_COMPILERS = CC=gcc CXX=g++
endif
Expand Down
29 changes: 19 additions & 10 deletions coreconf/WIN32.mk
Expand Up @@ -129,8 +129,26 @@ else # !NS_USE_GCC
ifdef USE_DYNAMICBASE
OS_DLLFLAGS += -DYNAMICBASE
endif
#
# Define USE_DEBUG_RTL if you want to use the debug runtime library
# (RTL) in the debug build.
# Define USE_STATIC_RTL if you want to use the static RTL.
#
ifdef USE_DEBUG_RTL
ifdef USE_STATIC_RTL
OS_CFLAGS += -MTd
else
OS_CFLAGS += -MDd
endif
OS_CFLAGS += -D_CRTDBG_MAP_ALLOC
else
ifdef USE_STATIC_RTL
OS_CFLAGS += -MT
else
OS_CFLAGS += -MD
endif
endif
ifdef BUILD_OPT
OS_CFLAGS += -MD
ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
OPTIMIZER += -O1
else
Expand All @@ -148,15 +166,6 @@ else # !NS_USE_GCC
LDFLAGS += -DEBUG -OPT:REF
endif
else
#
# Define USE_DEBUG_RTL if you want to use the debug runtime library
# (RTL) in the debug build
#
ifdef USE_DEBUG_RTL
OS_CFLAGS += -MDd -D_CRTDBG_MAP_ALLOC
else
OS_CFLAGS += -MD
endif
OPTIMIZER += -Zi -Fd$(OBJDIR)/ -Od
NULLSTRING :=
SPACE := $(NULLSTRING) # end of the line
Expand Down

0 comments on commit 409ea97

Please sign in to comment.