diff options
| author | Wan-Teh Chang <wtc@google.com> | 2014-08-08 10:22:38 -0700 |
|---|---|---|
| committer | Wan-Teh Chang <wtc@google.com> | 2014-08-08 10:22:38 -0700 |
| commit | 63105e38e221c70a9fc5445f4e55df643a3bbadb (patch) | |
| tree | 2247527951ec7d52df2e7742e3dc4a9e43a55c98 | |
| parent | f1adf43ebd5bbf113250ea904eaca368a515f0e8 (diff) | |
| download | nss-hg-63105e38e221c70a9fc5445f4e55df643a3bbadb.tar.gz | |
Bug 1043082: add the USE_STATIC_RTL makefile variable. r=ehsan.
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | coreconf/WIN32.mk | 29 |
2 files changed, 22 insertions, 10 deletions
@@ -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 diff --git a/coreconf/WIN32.mk b/coreconf/WIN32.mk index 71f2bdaa5..570d409e8 100644 --- a/coreconf/WIN32.mk +++ b/coreconf/WIN32.mk @@ -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 @@ -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 |