mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-11 07:13:20 +00:00
Minor changes to reduce packaging changes made by the Fedora maintainer.
(closes issue #12974) Reported by: jcollie Patches: 0001-Don-t-override-duplicate-optimization-flags.patch uploaded by jcollie (license 412) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134312 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
16
Makefile
16
Makefile
@@ -221,10 +221,16 @@ ifeq ($(OSARCH),linux-gnu)
|
||||
endif
|
||||
|
||||
ifeq ($(findstring -save-temps,$(ASTCFLAGS)),)
|
||||
ASTCFLAGS+=-pipe
|
||||
ifeq ($(findstring -pipe,$(ASTCFLAGS)),)
|
||||
ASTCFLAGS+=-pipe
|
||||
endif
|
||||
endif
|
||||
|
||||
ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
|
||||
ifeq ($(findstring -Wall,$(ASTCFLAGS)),)
|
||||
ASTCFLAGS+=-Wall
|
||||
endif
|
||||
|
||||
ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
|
||||
|
||||
ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
|
||||
|
||||
@@ -237,8 +243,10 @@ ifneq ($(findstring BSD,$(OSARCH)),)
|
||||
ASTLDFLAGS+=-L/usr/local/lib
|
||||
endif
|
||||
|
||||
ifneq ($(PROC),ultrasparc)
|
||||
ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
|
||||
ifeq ($(findstring -march,$(ASTCFLAGS)),)
|
||||
ifneq ($(PROC),ultrasparc)
|
||||
ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(PROC),ppc)
|
||||
|
Reference in New Issue
Block a user