diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-28 20:05:04 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-28 20:05:04 +0000 |
| commit | b810c1bfd908647f0d01aa54be2e1982a41ba791 (patch) | |
| tree | cfb8488560a5012f8914a2dec14ea7e5240e7823 /makeopts.in | |
| parent | 2e60b5456c33b7927a2fda8f5eb5ee08231e3867 (diff) | |
Merged revisions 214696 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r214696 | kpfleming | 2009-08-28 15:01:21 -0500 (Fri, 28 Aug 2009) | 9 lines
Ensure that CFLAGS and/or LDFLAGS provided to configure script are preserved.
Cross-compilation environments want to provide 'defaults' for compiler and
linker options, and frequently do this by specifying CFLAGS and LDFLAGS in the
environment or as command-line arguments to the configure script. This patch
modifies the configure script and Makefile to preserve these settings and
ensure they are used in the build process.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@214699 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'makeopts.in')
| -rw-r--r-- | makeopts.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/makeopts.in b/makeopts.in index 6a24183f1..307abbfa5 100644 --- a/makeopts.in +++ b/makeopts.in @@ -46,6 +46,9 @@ GC_LDFLAGS=@GC_LDFLAGS@ PTHREAD_CFLAGS=@PTHREAD_CFLAGS@ PTHREAD_LIBS=@PTHREAD_LIBS@ +CONFIG_CFLAGS=@CONFIG_CFLAGS@ +CONFIG_LDFLAGS=@CONFIG_LDFLAGS@ + prefix = @prefix@ exec_prefix = @exec_prefix@ |