From 2b80c5ed0b7f4b48b4789cddd3c94f0eb1246dec Mon Sep 17 00:00:00 2001 From: "leaf%mozilla.org" Date: Wed, 6 Mar 2002 09:50:34 +0000 Subject: [PATCH] fix PDBFILE definition and use for windows gmake builds, sr=cls, a=drivers git-svn-id: svn://10.0.0.236/trunk@115946 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/config/config.mk | 4 ++-- mozilla/config/rules.mk | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk index 88583509ddb..8077c924a40 100644 --- a/mozilla/config/config.mk +++ b/mozilla/config/config.mk @@ -289,7 +289,7 @@ ifdef MOZ_PROFILE _WIN32_PROFILE_FLAGS=-Zi -O1 -UDEBUG -DNDEBUG OS_CFLAGS += $(_WIN32_PROFILE_FLAGS) OS_CXXFLAGS += $(_WIN32_PROFILE_FLAGS) -OS_LDFLAGS += /DEBUG /DEBUGTYPE:CV /PDB:NONE /OPT:REF /OPT:nowin98 +OS_LDFLAGS += /DEBUG /DEBUGTYPE:CV /OPT:REF /OPT:nowin98 endif # if MOZ_COVERAGE is set, we handle pdb files slightly differently @@ -297,7 +297,7 @@ ifdef MOZ_COVERAGE _WIN32_COVERAGE_FLAGS=-Zi -O1 -UDEBUG -DNDEBUG OS_CFLAGS += $(_WIN32_COVERAGE_FLAGS) OS_CXXFLAGS += $(_WIN32_COVERAGE_FLAGS) -OS_LDFLAGS += /DEBUG /DEBUGTYPE:CV /PDB:$(PDBFILE) /OPT:REF /OPT:nowin98 +OS_LDFLAGS += /DEBUG /DEBUGTYPE:CV /OPT:REF /OPT:nowin98 endif # MOZ_COVERAGE diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk index 09c481eda82..416c6ba4809 100644 --- a/mozilla/config/rules.mk +++ b/mozilla/config/rules.mk @@ -194,6 +194,9 @@ endif ifeq ($(OS_ARCH),WINNT) +ifdef MOZ_PROFILE +PDBFILE=NONE +else ifdef LIBRARY_NAME PDBFILE=$(LIBRARY_NAME).pdb ifdef MOZ_DEBUG @@ -206,6 +209,7 @@ MAPFILE=$*.map CODFILE=$*.cod endif endif +endif ifdef DEFFILE CFLAGS += /DEF:$(DEFFILE)