From 3f89d1b6d1d28018f8706faefbbac040e4188e1a Mon Sep 17 00:00:00 2001
From: Robin Watts <Robin.Watts@artifex.com>
Date: Mon, 9 Apr 2012 12:08:48 +0100
Subject: Bug 692976: Fix spurious thread lock debug warnings on context clones

When cloning, ensure the locks are done on the new context, not the
old one; this makes no difference except to suppress some spurious
debugging messages.

Also ensure that DEBUG is predefined for Makefile based debug and memento
builds.

Thanks to Bas Weelinck.
---
 Makerules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makerules')

diff --git a/Makerules b/Makerules
index 98fe9168..98210904 100644
--- a/Makerules
+++ b/Makerules
@@ -6,7 +6,7 @@ OS := $(OS:MINGW%=MINGW)
 CFLAGS += -Wall
 
 ifeq "$(build)" "debug"
-CFLAGS += -pipe -g
+CFLAGS += -pipe -g -DDEBUG
 else ifeq "$(build)" "profile"
 CFLAGS += -pipe -O2 -DNDEBUG -pg
 LDFLAGS += -pg
@@ -15,7 +15,7 @@ CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
 else ifeq "$(build)" "native"
 CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer -march=native -mfpmath=sse
 else ifeq "$(build)" "memento"
-CFLAGS += -pipe -g -DMEMENTO
+CFLAGS += -pipe -g -DMEMENTO -DDEBUG
 else
 $(error unknown build setting: '$(build)')
 endif
-- 
cgit v1.2.3