From 5546e323550422b8a84e7c1d0b69e11623666cb6 Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Tue, 22 Jun 2004 17:42:14 +0000 Subject: Merge major BSD mutex and symbol conflict patches (bug #1816) (link patch still pending) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3273 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- codecs/gsm/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'codecs/gsm') diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index 1cfa939e1..9105ef4f3 100755 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -64,8 +64,8 @@ PG = # CC = /usr/lang/acc # CCFLAGS = -c -O -CC = gcc $(OPTIMIZE) -fomit-frame-pointer -CCFLAGS += -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC +CC ?= gcc +CCFLAGS += -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC $(OPTIMIZE) -fomit-frame-pointer LD = $(CC) @@ -150,7 +150,7 @@ INC = $(ROOT)/inc DEBUG = -DNDEBUG ######### Remove -DNDEBUG to enable assertions. -CFLAGS = $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \ +CFLAGS += $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \ $(LTP_CUT) $(WAV49) $(K6OPT) $(CCINC) -I$(INC) ######### It's $(CC) $(CFLAGS) -- cgit v1.2.3