aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-28 15:10:57 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-28 15:10:57 +0000
commit435c27995e383057ba585b6e635a2018c8856a52 (patch)
tree115245277e0190d58ab1535d27b1d357c482b7ca /Makefile
parent75308d4ef4cdc48e9889aceb10dbfe28582a5548 (diff)
fix the case where menuselect.makeopts is getting generated in the same run of
"make" as the current build and some of the MENUELSELECT_CFLAGS are set in the user or global level asterisk.makeopts file git-svn-id: http://svn.digium.com/svn/asterisk/trunk@36192 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index b66bf0b72..df7f83914 100644
--- a/Makefile
+++ b/Makefile
@@ -132,6 +132,10 @@ TOPDIR_CFLAGS=-Iinclude
MOD_SUBDIR_CFLAGS=-I../include -I..
OTHER_SUBDIR_CFLAGS=-I../include -I..
+ifeq ($(origin MENUSELECT_CFLAGS),undefined)
+ MENUSELECT_CFLAGS:=$(shell echo $(or $(shell grep MENUSELECT_CFLAGS $(USER_MAKEOPTS) .),$(shell grep MENUSELECT_CFLAGS $(GLOBAL_MAKEOPTS) .)) | cut -f2 -d'=')
+endif
+
ifeq ($(or $(findstring dont-optimize,$(MAKECMDGOALS)),$(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS))),)
# More GSM codec optimization
# Uncomment to enable MMXTM optimizations for x86 architecture CPU's