diff options
| author | nelson%bolyard.com <devnull@localhost> | 2007-01-06 05:48:54 +0000 |
|---|---|---|
| committer | nelson%bolyard.com <devnull@localhost> | 2007-01-06 05:48:54 +0000 |
| commit | f05417a43164f947b0a733661d0701fb05cbdada (patch) | |
| tree | 535cbc5056d3fd52af8c31c02e13a3574d45abb0 | |
| parent | 358a46c63111640504a5a6604989c315ecef6082 (diff) | |
| download | nss-hg-f05417a43164f947b0a733661d0701fb05cbdada.tar.gz | |
Bug 232600. Define MOZ_DEBUG_SYMBOLS in environment to create .pdb files
and install them in $DIST. r=rrelyea,wtchang
| -rw-r--r-- | security/coreconf/WIN32.mk | 7 | ||||
| -rw-r--r-- | security/coreconf/rules.mk | 10 |
2 files changed, 16 insertions, 1 deletions
diff --git a/security/coreconf/WIN32.mk b/security/coreconf/WIN32.mk index 3cc45aa7a..1d9fadfaa 100644 --- a/security/coreconf/WIN32.mk +++ b/security/coreconf/WIN32.mk @@ -149,9 +149,14 @@ else # !NS_USE_GCC USERNAME := $(subst -,_,$(USERNAME)) DEFINES += -DDEBUG -D_DEBUG -UNDEBUG -DDEBUG_$(USERNAME) DLLFLAGS += -DEBUG -OUT:"$@" + LDFLAGS += -DEBUG +ifndef MOZ_DEBUG_SYMBOLS + LDFLAGS += -PDB:NONE +endif # Purify requires /FIXED:NO when linking EXEs. - LDFLAGS += -DEBUG -PDB:NONE /FIXED:NO + LDFLAGS += /FIXED:NO endif + DEFINES += -D_CRT_SECURE_NO_WARNINGS endif # NS_USE_GCC DEFINES += -DWIN32 diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk index ef6b2dc25..212e13262 100644 --- a/security/coreconf/rules.mk +++ b/security/coreconf/rules.mk @@ -114,12 +114,22 @@ ifdef LIBRARY endif ifdef SHARED_LIBRARY $(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR) +ifdef MOZ_DEBUG_SYMBOLS +ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) + $(INSTALL) -m 644 $(SHARED_LIBRARY:$(DLL_SUFFIX)=pdb) $(SOURCE_LIB_DIR) +endif +endif endif ifdef IMPORT_LIBRARY $(INSTALL) -m 775 $(IMPORT_LIBRARY) $(SOURCE_LIB_DIR) endif ifdef PROGRAM $(INSTALL) -m 775 $(PROGRAM) $(SOURCE_BIN_DIR) +ifdef MOZ_DEBUG_SYMBOLS +ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) + $(INSTALL) -m 644 $(PROGRAM:$(PROG_SUFFIX)=.pdb) $(SOURCE_BIN_DIR) +endif +endif endif ifdef PROGRAMS $(INSTALL) -m 775 $(PROGRAMS) $(SOURCE_BIN_DIR) |