Gitweb:
http://git.exim.org/exim.git/commitdiff/13d08c906fd061e1ebd673789b132ce2a5d2e782
Commit: 13d08c906fd061e1ebd673789b132ce2a5d2e782
Parent: a5f239e4959d4df6a4a341d8855e14d17399d671
Author: Phil Pennock <pdp@???>
AuthorDate: Mon Jun 25 03:27:47 2012 -0700
Committer: Phil Pennock <pdp@???>
CommitDate: Mon Jun 25 03:27:47 2012 -0700
Let Linux makefile inherit CFLAGS/CFLAGS_DYNAMIC.
Pulled from Debian 30_dontoverridecflags.dpatch by Andreas Metzler.
We just add CFLAGS_DYNAMIC too and some comments.
Non-POSIX syntax, but fairly portable; GNU make gained it in 1998,
we believe even very old systems should handle it fine.
---
doc/doc-txt/ChangeLog | 3 +++
src/OS/Makefile-Linux | 9 +++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 8fa9621..d1beab6 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -46,6 +46,9 @@ JH/03 Add expansion operators ${listnamed:name} and ${listcount:string}
PP/09 Add gnutls_enable_pkcs11 option.
+PP/10 Let Linux makefile inherit CFLAGS/CFLAGS_DYNAMIC.
+ Pulled from Debian 30_dontoverridecflags.dpatch by Andreas Metzler.
+
Exim version 4.80
-----------------
diff --git a/src/OS/Makefile-Linux b/src/OS/Makefile-Linux
index 8b72141..990f884 100644
--- a/src/OS/Makefile-Linux
+++ b/src/OS/Makefile-Linux
@@ -1,5 +1,9 @@
# Exim: OS-specific make file for Linux. This is for modern Linuxes,
# which use libc6.
+#
+# For Linux, we assume GNU Make; at time of writing, the only extension
+# used is ?= which is actually portable to other maintained Make variants,
+# just is not POSIX.
HAVE_ICONV=yes
@@ -8,8 +12,9 @@ CHOWN_COMMAND=look_for_it
CHGRP_COMMAND=look_for_it
CHMOD_COMMAND=look_for_it
-CFLAGS=-O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-CFLAGS_DYNAMIC=-shared -rdynamic
+# Preserve CFLAGS and CFLAGS_DYNAMIC from the caller/environment
+CFLAGS ?= -O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+CFLAGS_DYNAMIC ?= -shared -rdynamic
DBMLIB = -ldb
USE_DB = yes
