aboutsummaryrefslogtreecommitdiffstats
path: root/main/Makefile
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-08-26 17:05:38 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-08-26 17:05:38 +0000
commit1773d7b4feed3b3745d2e72ac8bc0d80b2d8edd8 (patch)
treee24b125fabca0ac52912e0bcd8f0433a5f2c6db3 /main/Makefile
parentda5141501bbaee1750bd85d88dd86d8b5acbb040 (diff)
ensure that cross-compiler info is removed from the enviroment before configuring menuselect
ensure that the user's LDFLAGS take precedence when linking the final binary git-svn-id: http://svn.digium.com/svn/asterisk/trunk@41178 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/Makefile')
-rw-r--r--main/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/Makefile b/main/Makefile
index f9c40592a..ff90809a3 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -134,7 +134,7 @@ asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
@rm -f $(ASTTOPDIR)/include/asterisk/build.h.tmp
@$(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
- $(CMD_PREFIX) $(CXX) $(LDFLAGS) $(STATIC_BUILD) -o asterisk $(ASTLINK) $(AST_EMBED_LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS)
+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o asterisk $(ASTLINK) $(AST_EMBED_LDFLAGS) $(LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS)
clean::
rm -f asterisk