about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-09-17T15·07+0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-09-17T15·07+0200
commit5a05cf4063fc6ea666f3e24c60bd2e9e5526ef4e (patch)
tree6fd1fa6286e9b7c29d713ec125d38dd27944f8f8
parent6e5b02bee4c117863f11e4697da9e4f55b81e52d (diff)
Add Make flag to disable optimization
-rw-r--r--Makefile9
-rw-r--r--configure.ac4
2 files changed, 10 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index d6c645f0f336..b41a820275f4 100644
--- a/Makefile
+++ b/Makefile
@@ -22,8 +22,15 @@ makefiles = \
   doc/manual/local.mk \
   tests/local.mk
 
-GLOBAL_CXXFLAGS += -std=c++0x
+GLOBAL_CXXFLAGS += -std=c++0x -g -Wall
 
 include Makefile.config
 
+OPTIMIZE = 1
+
+ifeq ($(OPTIMIZE), 1)
+  GLOBAL_CFLAGS += -O3
+  GLOBAL_CXXFLAGS += -O3
+endif
+
 include mk/lib.mk
diff --git a/configure.ac b/configure.ac
index 00c1d495d445..89fd6b96e79d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,8 +54,8 @@ if test "$sys_name" = sunos; then
 fi
 
 
-CFLAGS=${CFLAGS:--g -O3 -Wall}
-CXXFLAGS=${CXXFLAGS:--g -O3 -Wall}
+CFLAGS=
+CXXFLAGS=
 AC_PROG_CC
 AC_PROG_CXX