On Wed, Jul 24, 2013 at 4:53 PM, Ian Kent <raven@xxxxxxxxxx> wrote: > From: Lan Yixun (dlan) <dennis.yxun@xxxxxxxxx> > > the logic here is: > if user pass compiler variable, then use it, otherwise fallback to default value > > this will provide most flexibility, so user can set this variable > it would be even useful for cross-compile environment. > > Signed-off-by: Lan Yixun (dlan) <dennis.yxun@xxxxxxxxx> > --- > CHANGELOG | 1 + > Makefile.conf.in | 3 +++ > Makefile.rules | 8 ++++---- > 3 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/CHANGELOG b/CHANGELOG > index 72d9135..ebabf21 100644 > --- a/CHANGELOG > +++ b/CHANGELOG > @@ -61,6 +61,7 @@ > - fix hesiod check error and use correct $(LIBS) setting. > - fix dead LDAP symbolic link when LDAP support is disabled. > - add missing libtirpc lib to mount_nfs.so when TIRPC enabled. > +- use compiler determined by configure instead of hard-coded ones. > > 25/07/2012 autofs-5.0.7 > ======================= > diff --git a/Makefile.conf.in b/Makefile.conf.in > index 3766d45..cb53e66 100644 > --- a/Makefile.conf.in > +++ b/Makefile.conf.in > @@ -109,3 +109,6 @@ initdir = @initdir@ > > # Location of systemd unit files > systemddir = @systemddir@ > + > +# Use the compiler determined by configure instead of hard-coded ones > +CC := @CC@ > diff --git a/Makefile.rules b/Makefile.rules > index 6b5b2bd..9aebd19 100644 > --- a/Makefile.rules > +++ b/Makefile.rules > @@ -38,10 +38,10 @@ STRIP = strip --strip-debug > endif > endif > > -CC = gcc > -CXX = g++ > -CXXFLAGS = $(CFLAGS) > -LD = ld > +CC ?= gcc > +CXX ?= g++ > +CXXFLAGS ?= $(CFLAGS) > +LD ?= ld > SOLDFLAGS = -shared > > CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64 > HI Ian: Missed the changes for "LDFLAGS"?also need to change from " =" to " ?= " but it's strange that you seems correct in [PATCH 6/9] autofs-5.0.7 - remove hard-coded STRIP variable LDFLAGS ?= -g --> correct -STRIP = : +STRIP ?= : else ifdef DONTSTRIP CFLAGS ?= -O2 -g LDFLAGS ?= -g --> correct -STRIP = : +STRIP ?= : else CFLAGS ?= -O2 -Wall LDFLAGS ?= -s --> correct -- To unsubscribe from this list: send the line "unsubscribe autofs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
