From: Kevin P. Fleming Date: Mon, 26 Sep 2005 02:08:06 +0000 (+0000) Subject: fix minor build problem on *BSD (issue #5290) X-Git-Tag: 1.2.0-beta2~261 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d63d731aa5002d77dbc45108969fbd6ba73b239;p=thirdparty%2Fasterisk.git fix minor build problem on *BSD (issue #5290) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6658 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/Makefile b/Makefile index 914f388c57..b83a7039ce 100755 --- a/Makefile +++ b/Makefile @@ -201,11 +201,6 @@ ifeq (${OSARCH},Linux) MPG123TARG=linux endif -ifeq ($(findstring BSD,${OSARCH}),BSD) - PROC=$(shell uname -m) - ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -endif - PWD=$(shell pwd) GREP=grep @@ -218,6 +213,11 @@ INCLUDE=-Iinclude -I../include ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY ASTCFLAGS+=$(OPTIMIZE) +ifeq ($(findstring BSD,${OSARCH}),BSD) + PROC=$(shell uname -m) + ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/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) endif