diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-08-26 17:05:38 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-08-26 17:05:38 +0000 |
| commit | 3ba8e0a9736ce41e146418de7c7fbcf4c8f25bc4 (patch) | |
| tree | e24b125fabca0ac52912e0bcd8f0433a5f2c6db3 /main/Makefile | |
| parent | aa7b32d1750b732b45f5fe12a58308cb047ec959 (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: https://origsvn.digium.com/svn/asterisk/trunk@41178 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/Makefile')
| -rw-r--r-- | main/Makefile | 2 |
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 |