diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2009-08-28 20:01:21 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2009-08-28 20:01:21 +0000 |
commit | 802b79e3ca114e5958e12e57c5eb7f0569f45c77 (patch) | |
tree | 94a3fc2d8afe760a93e732a57af1b8f082bc47c5 /Makefile | |
parent | f199054c88ea146da16164fd4d2d6b96f4417cee (diff) |
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: https://origsvn.digium.com/svn/asterisk/trunk@214696 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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) |