mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-19 11:42:27 +00:00
clean up a little mess I created by using the 'or' function instead of gross
nested if statements git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35459 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
9
Makefile
9
Makefile
@@ -133,8 +133,7 @@ TOPDIR_CFLAGS=-Iinclude
|
|||||||
MOD_SUBDIR_CFLAGS=-I../include -I..
|
MOD_SUBDIR_CFLAGS=-I../include -I..
|
||||||
OTHER_SUBDIR_CFLAGS=-I../include -I..
|
OTHER_SUBDIR_CFLAGS=-I../include -I..
|
||||||
|
|
||||||
ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
|
ifeq ($(or $(findstring dont-optimize,$(MAKECMDGOALS)),$(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS))),)
|
||||||
ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
|
|
||||||
# More GSM codec optimization
|
# More GSM codec optimization
|
||||||
# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
|
# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
|
||||||
# which support MMX instructions. This should be newer pentiums,
|
# which support MMX instructions. This should be newer pentiums,
|
||||||
@@ -143,12 +142,6 @@ ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
|
|||||||
|
|
||||||
# Tell gcc to optimize the code
|
# Tell gcc to optimize the code
|
||||||
OPTIMIZE+=-O6
|
OPTIMIZE+=-O6
|
||||||
else
|
|
||||||
# Stack backtraces, while useful for debugging, are incompatible with optimizations
|
|
||||||
ifeq ($(OSARCH),Linux)
|
|
||||||
CFLAGS+=-DSTACK_BACKTRACES
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
else
|
else
|
||||||
# Stack backtraces, while useful for debugging, are incompatible with optimizations
|
# Stack backtraces, while useful for debugging, are incompatible with optimizations
|
||||||
ifeq ($(OSARCH),Linux)
|
ifeq ($(OSARCH),Linux)
|
||||||
|
Reference in New Issue
Block a user