From f3fbe7d88fe8177c189d15efc8e20738684b070b Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Tue, 28 Feb 2012 14:45:21 +0000 Subject: [PATCH] Make COMPILE_DOUBLE magic actually work. The build system has some special magic to ensure that if Asterisk is built with --enable-dev-mode *and* DONT_OPTIMIZE, that all the source is still compiled with the optimizer enabled (even though the result will be thrown away), because the compiler is able to find a great deal of coding errors and bugs as a result of running its optimizers. Unfortunately at some point this mode got broken, and the 'throwaway' compile of the code was no longer done with the optimizer enabled. This patch corrects that problem. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@357212 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile.rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.rules b/Makefile.rules index 0bb32825af..f40a8f041a 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -87,14 +87,14 @@ endif %.o: %.s $(ECHO_PREFIX) echo " [AS] $< -> $@" ifeq ($(COMPILE_DOUBLE),yes) - $(CMD_PREFIX) $(CC) -o /dev/null -c $< $(OPTIMIZE) $(CC_CFLAGS) + $(CMD_PREFIX) $(CC) -o /dev/null -c $< $(CC_CFLAGS) $(OPTIMIZE) endif $(CMD_PREFIX) $(CC) -o $@ -c $< $(CC_CFLAGS) %.o: %.i $(ECHO_PREFIX) echo " [CCi] $< -> $@" ifeq ($(COMPILE_DOUBLE),yes) - $(CMD_PREFIX) $(CC) -o /dev/null -c $< $(OPTIMIZE) $(CC_CFLAGS) + $(CMD_PREFIX) $(CC) -o /dev/null -c $< $(CC_CFLAGS) $(OPTIMIZE) endif $(CMD_PREFIX) $(CC) -o $@ -c $< $(CC_CFLAGS) @@ -111,7 +111,7 @@ endif %.oo: %.ii $(ECHO_PREFIX) echo " [CXXi] $< -> $@" ifeq ($(COMPILE_DOUBLE),yes) - $(CMD_PREFIX) $(CXX) -o /dev/null -c $< $(OPTIMIZE) $(CXX_CFLAGS) + $(CMD_PREFIX) $(CXX) -o /dev/null -c $< $(CXX_CFLAGS) $(OPTIMIZE) endif $(CMD_PREFIX) $(CXX) -o $@ -c $< $(CXX_CFLAGS)