Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

remove the two uses of the $(or ...) function since it is only supported by

Browse Source 
GNU make 3.81 which is less than 3 months old (issue #7442, patch by Corydon76)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36226 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Russell Bryant 20 years ago
parent 9d61f19cee
commit c248b690e4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File

5
Makefile
Unescape View File

@ -133,10 +133,11 @@ MOD_SUBDIR_CFLAGS=-I../include -I..
OTHER_SUBDIR_CFLAGS=-I../include -I.. OTHER_SUBDIR_CFLAGS=-I../include -I..
ifeq ($(origin MENUSELECT_CFLAGS),undefined) 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'=') MENUSELECT_CFLAGS:=$(shell grep MENUSELECT_CFLAGS $(USER_MAKEOPTS) . | cut -f2 -d'=')
MENUSELECT_CFLAGS?=$(shell grep MENUSELECT_CFLAGS $(GLOBAL_MAKEOPTS) . | cut -f2 -d'=')
endif endif
ifeq ($(or $(findstring dont-optimize,$(MAKECMDGOALS)),$(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS))),) ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),$(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,

Write Preview
Loading…
Cancel
Save