From e4ef1b46a13df2e5d713ef5bead4bf9969786ec2 Mon Sep 17 00:00:00 2001 From: "seawood%netscape.com" Date: Thu, 16 May 2002 19:02:45 +0000 Subject: [PATCH] Override compile flags instead of appending them for profile, coverage & trace-malloc builds. This should fix the talkback line number issue. Bug #141834 r=leaf sr=jdunn --- config/config.mk | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/config/config.mk b/config/config.mk index 0f08a1b79c6..168aed7b44d 100644 --- a/config/config.mk +++ b/config/config.mk @@ -286,18 +286,14 @@ else # an optimized build with debugging symbols. Useful for debugging # compiler optimization bugs, as well as running with Quantify. 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 /OPT:REF /OPT:nowin98 +MOZ_OPTIMIZE_FLAGS=-Zi -O1 -UDEBUG -DNDEBUG +OS_LDFLAGS = /DEBUG /DEBUGTYPE:CV /OPT:REF /OPT:nowin98 endif # if MOZ_COVERAGE is set, we handle pdb files slightly differently 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 /OPT:REF /OPT:nowin98 +MOZ_OPTIMIZE_FLAGS=-Zi -O1 -UDEBUG -DNDEBUG +OS_LDFLAGS = /DEBUG /DEBUGTYPE:CV /OPT:REF /OPT:nowin98 endif # MOZ_COVERAGE @@ -307,7 +303,7 @@ endif # ifdef NS_TRACE_MALLOC MOZ_OPTIMIZE_FLAGS=-Zi -Od -UDEBUG -DNDEBUG -OS_LDFLAGS += /DEBUG /DEBUGTYPE:CV /PDB:NONE /OPT:REF /OPT:nowin98 +OS_LDFLAGS = /DEBUG /DEBUGTYPE:CV /PDB:NONE /OPT:REF /OPT:nowin98 endif # NS_TRACE_MALLOC