From: Wolfgang Bumiller <wry.git@bumiller.com>
Date: Fri, 26 Sep 2014 13:32:14 +0000 (+0200)
Subject: accidentally left those in
X-Git-Tag: xonotic-v0.8.1~9^2~21
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=459356a48dafe7c4b7c6c43a633484508abc7dcc;p=xonotic%2Fgmqcc.git

accidentally left those in
---

diff --git a/Makefile b/Makefile
index 7697cfc..f6a21ff 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,7 @@ ifeq ($(CC), clang)
 	    -Wno-unknown-warning-option        \
 	    -Wno-cast-align                    \
 	    -Wno-assign-enum                   \
-	    -pedantic-errors                   \
-	    -fsanitize=address -fno-omit-frame-pointer
+	    -pedantic-errors
 else
 	ifneq ($(CC), g++)
 		CFLAGS += -Wmissing-prototypes -Wstrict-prototypes
@@ -42,7 +41,7 @@ endif
 # do this last otherwise there is whitespace in the command output and
 # it makes my OCD act up
 CFLAGS += $(OPTIONAL_CFLAGS)
-LDFLAGS += $(OPTIONAL_LDFLAGS) -fsanitize=address -fno-omit-frame-pointer
+LDFLAGS += $(OPTIONAL_LDFLAGS)
 
 #we have duplicate object files when dealing with creating a simple list
 #for dependinces. To combat this we use some clever recrusive-make to