diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-28 20:05:56 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-28 20:05:56 +0000 |
| commit | 3282814d00360edb2aa3cd614776f9fa03f45d05 (patch) | |
| tree | a5229bf5f9f2d67adbdff7287fe57a64ebae5720 /Makefile | |
| parent | 5ed7fdc6f63281c068e0f8dc3c882785485fbb6b (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.2@214700 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -95,10 +95,17 @@ ifneq ($(wildcard makeopts),) include makeopts endif +# start the primary CFLAGS and LDFLAGS with any that were provided +# to the configure script +_ASTCFLAGS:=$(CONFIG_CFLAGS) +_ASTLDFLAGS:=$(CONFIG_LDFLAGS) + # Some build systems, such as the one in openwrt, like to pass custom target -# CFLAGS and LDFLAGS in the COPTS and LDOPTS variables. -ASTCFLAGS+=$(COPTS) -ASTLDFLAGS+=$(LDOPTS) +# CFLAGS and LDFLAGS in the COPTS and LDOPTS variables; these should also +# go before any build-system computed flags, since they are defaults, not +# overrides +_ASTCFLAGS+=$(COPTS) +_ASTLDFLAGS+=$(LDOPTS) # libxml2 cflags _ASTCFLAGS+=$(LIBXML2_INCLUDE) |