From 96e4e31eeb728c89a971b63a140506ddce3c0305 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Tue, 21 Jul 2009 13:28:04 +0000 Subject: Merged revisions 207647 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r207647 | kpfleming | 2009-07-21 08:04:44 -0500 (Tue, 21 Jul 2009) | 12 lines Ensure that user-provided CFLAGS and LDFLAGS are honored. This commit changes the build system so that user-provided flags (in ASTCFLAGS and ASTLDFLAGS) are supplied to the compiler/linker *after* all flags provided by the build system itself, so that the user can effectively override the build system's flags if desired. In addition, ASTCFLAGS and ASTLDFLAGS can now be provided *either* in the environment before running 'make', or as variable assignments on the 'make' command line. As a result, the use of COPTS and LDOPTS is no longer necessary, so they are no longer documented, but are still supported so as not to break existing build systems that supply them when building Asterisk. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@207680 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- funcs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'funcs') diff --git a/funcs/Makefile b/funcs/Makefile index bc4745d08..2c1c1cb3e 100644 --- a/funcs/Makefile +++ b/funcs/Makefile @@ -24,4 +24,4 @@ include $(ASTTOPDIR)/Makefile.moddir_rules # can't check the string and arguments to ensure they match, so this # warning must be disabled; for safety reasons, SPRINTF() is kept in # a separate module so that as little code as possible is left unchecked -func_sprintf.o: ASTCFLAGS+=-Wno-format-nonliteral +func_sprintf.o: _ASTCFLAGS+=-Wno-format-nonliteral -- cgit v1.2.3