summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornot-a-robot <not-a-robot@rediger.net>2016-04-20 18:49:22 +0200
committernot-a-robot <not-a-robot@rediger.net>2016-04-20 18:49:22 +0200
commit8ef4c472f85b8c964c3f5637de299d52cf17bf2d (patch)
tree504a66a9bbaa0ed819da2296c51341e688c48685
parent81e8176bacd27e2cc0db021a22c03a2891ade7eb (diff)
parent0616677c932acff214c228850febcc1a07edb140 (diff)
Auto merge of #418 - redis:debug-flags, r=badboy
fix: Rename DEBUG to DEBUG_FLAGS This avoids issues with environments where DEBUG is set to an arbitrary value to force debug mode in other tools. BREAKING CHANGE: This breaks builds that explicitely set `DEBUG` to some value (even the empty value). To get back the old behaviour change the `DEBUG_FLAGS` variable now. Cloes #381
-rw-r--r--CHANGELOG.md8
-rw-r--r--Makefile4
2 files changed, 10 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c62fe9..f92bcb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,14 @@ This removes the following old function aliases, use the new name now:
| redisReplyReaderGetObject | redisReaderGetObject |
| redisReplyReaderGetError | redisReaderGetError |
+* The `DEBUG` variable in the Makefile was renamed to `DEBUG_FLAGS`
+
+Previously it broke some builds for people that had `DEBUG` set to some arbitrary value,
+due to debugging other software.
+By renaming we avoid unintentional name clashes.
+
+Simply rename `DEBUG` to `DEBUG_FLAGS` in your environment to make it working again.
+
### 0.13.3 (2015-09-16)
* Revert "Clear `REDIS_CONNECTED` flag when connection is closed".
diff --git a/Makefile b/Makefile
index cff2a84..9a4de83 100644
--- a/Makefile
+++ b/Makefile
@@ -40,8 +40,8 @@ CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
OPTIMIZATION?=-O3
WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
-DEBUG?= -g -ggdb
-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH)
+DEBUG_FLAGS?= -g -ggdb
+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(ARCH)
REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
DYLIBSUFFIX=so