mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
merge compile fixes from 44080:
- with AST_DEVMODE, building codecs/lpc10 fails because of lots of warnings, and the configure step in editline fails as well. Fix this by removing the -Werror in these steps. - on FreeBSD (but probably on other platforms as well), the final link of asterisk fails because AST_LIBS was not exported to the subdirs Makefiles. Add a proper fix in the top-level Makefile (a possible alternative way is to add "export AST_LIBS" near the beginning of the file). With this fix, i believe that some of the platform-specific conditionals in main/Makefile are redundant (because they should be already dealt with in the top level Makefile) but i don't have a platform to check. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44081 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -23,30 +23,34 @@ LIB_TARGET_DIR = .
|
||||
|
||||
CFLAGS+= -fPIC -Wno-comment
|
||||
|
||||
# The code here generates lots of warnings, so compiling with -Werror
|
||||
# fails miserably. Remove it for the time being.
|
||||
ASTCFLAGS:= $(ASTCFLAGS:-Werror=)
|
||||
|
||||
#fix for PPC processors and ALPHA, And UltraSparc too
|
||||
ifneq ($(OSARCH),Darwin)
|
||||
ifneq ($(findstring BSD,${OSARCH}),BSD)
|
||||
ifneq ($(PROC),ppc)
|
||||
ifneq ($(PROC),x86_64)
|
||||
ifneq ($(PROC),alpha)
|
||||
ifneq ($(findstring BSD,${OSARCH}),BSD)
|
||||
ifneq ($(PROC),ppc)
|
||||
ifneq ($(PROC),x86_64)
|
||||
ifneq ($(PROC),alpha)
|
||||
#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
|
||||
#This works for even old (2.96) versions of gcc and provides a small boost either way.
|
||||
#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn.t support it.
|
||||
#So we go lowest common available by gcc and go a step down, still a step up from
|
||||
#the default as we now have a better instruction set to work with. - Belgarath
|
||||
ifeq ($(PROC),ultrasparc)
|
||||
ifeq ($(PROC),ultrasparc)
|
||||
CFLAGS+= -mtune=$(PROC) -mcpu=v8 -O3 -fomit-frame-pointer
|
||||
else
|
||||
ifneq ($(OSARCH),SunOS)
|
||||
ifneq ($(OSARCH),arm)
|
||||
else
|
||||
ifneq ($(OSARCH),SunOS)
|
||||
ifneq ($(OSARCH),arm)
|
||||
# CFLAGS+= -march=$(PROC)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
LIB = $(LIB_TARGET_DIR)/liblpc10.a
|
||||
|
Reference in New Issue
Block a user