diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-01 22:35:52 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-01 22:35:52 +0000 |
| commit | 1675708f88249fa04c6135d8e889791c631109b2 (patch) | |
| tree | 6edaa2e8ccf73ae403000c1b2bfad93110f65058 /build_tools | |
| parent | 6712e666a8c4e4b0fc84f2d04b8975ec9fe6c1a6 (diff) | |
Merged revisions 46845 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r46845 | russell | 2006-11-01 17:32:12 -0500 (Wed, 01 Nov 2006) | 5 lines
Add a check in the configure script to determine whether ld is GNU ld or not.
This is needed because module embedding only works for gnu ld. GNU ld is now
listed as a dependency for all of the module embedding options in menuselect.
(issue #8143)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@46846 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'build_tools')
| -rw-r--r-- | build_tools/embed_modules.xml | 8 | ||||
| -rw-r--r-- | build_tools/menuselect-deps.in | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/build_tools/embed_modules.xml b/build_tools/embed_modules.xml index b064b842d..54ae622ce 100644 --- a/build_tools/embed_modules.xml +++ b/build_tools/embed_modules.xml @@ -1,18 +1,26 @@ <category name="MENUSELECT_EMBED" displayname="Module Embedding" positive_output="yes" remove_on_change="main/asterisk"> <member name="apps" displayname="Applications" remove_on_change="apps/*.o"> + <depend>gnu_ld</depend> </member> <member name="cdr" displayname="Call Detail Recording" remove_on_change="cdr/*.o"> + <depend>gnu_ld</depend> </member> <member name="channels" displayname="Channels" remove_on_change="channels/*.o channels/misdn/*.o"> + <depend>gnu_ld</depend> </member> <member name="codecs" displayname="Coders/Decoders" remove_on_change="codecs/*.o codecs/gsm/src/*.o codecs/ilbc/*.o codecs/lpc10/*.o codecs/gsm/lib/libgsm.a codecs/lpc10/liblpc10.a codecs/ilbc/libilbc.a"> + <depend>gnu_ld</depend> </member> <member name="formats" displayname="File Formats" remove_on_change="formats/*.o"> + <depend>gnu_ld</depend> </member> <member name="funcs" displayname="Dialplan Functions" remove_on_change="funcs/*.o"> + <depend>gnu_ld</depend> </member> <member name="pbx" displayname="PBX Functionality" remove_on_change="pbx/*.o pbx/ael/*.o"> + <depend>gnu_ld</depend> </member> <member name="res" displayname="Resource Modules" remove_on_change="res/*.o res/snmp/*.o"> + <depend>gnu_ld</depend> </member> </category> diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index 7017e8ac6..17ac9a13a 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -34,3 +34,4 @@ ZLIB=@PBX_ZLIB@ ISDNNET=@PBX_ISDNNET@ MISDN=@PBX_MISDN@ SUPPSERV=@PBX_SUPPSERV@ +GNU_LD=@GNU_LD@ |