diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-22 17:42:14 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-22 17:42:14 +0000 |
| commit | ae5c80e1deeae11fa0f3478a6efa03e38971897f (patch) | |
| tree | a3a0875ae4e73c9d9a1fc67f56ffa1ce73fe5457 /codecs/lpc10 | |
| parent | 8f813d432c685f0b0c25e98261379b083263cf32 (diff) | |
Merge major BSD mutex and symbol conflict patches (bug #1816) (link patch still pending)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3273 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs/lpc10')
| -rwxr-xr-x | codecs/lpc10/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/codecs/lpc10/Makefile b/codecs/lpc10/Makefile index af8d907f6..cd1e973ef 100755 --- a/codecs/lpc10/Makefile +++ b/codecs/lpc10/Makefile @@ -3,7 +3,7 @@ # # default C compiler -CC= gcc +CC?= gcc # # These definitions for CFLAGS and LIB_TARGET_DIR are used when one @@ -22,11 +22,12 @@ LIB_TARGET_DIR = . # WARNINGS = -Wall -Wno-comment -Wno-error -CFLAGS = $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC +CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi) #fix for PPC processors and ALPHA too ifneq ($(OSARCH),Darwin) +ifneq ($(findstring BSD,${OSARCH}),BSD) ifneq ($(PROC),ppc) ifneq ($(PROC),x86_64) ifneq ($(PROC),alpha) @@ -35,6 +36,7 @@ endif endif endif endif +endif LIB = $(LIB_TARGET_DIR)/liblpc10.a |