Messages in this thread | | | Date | Wed, 12 Apr 2017 09:56:29 +0200 | From | Jiri Olsa <> | Subject | Re: [PATCH 2/6] tools build: fix feature redefine build flags |
| |
On Tue, Apr 11, 2017 at 11:49:15PM -0700, David Carrillo-Cisneros wrote: > This change is a follow up of https://lkml.org/lkml/2017/2/2/16
hi, there's another 2/6 in this patchset with same change but slightly different changelog
jirka
> > The patch above avoided redefining CC, CXX and PKG_CONFIG in feature > detection. The patch was not merged due to a unsolved concern with > the -MD flag. > > Later, commit c8c188679c ("tools build: Use the same CC for feature > detection and actual build") > did the change for CC and CXX but not PKG_CONFIG. > > This patch makes PKG_CONFIG consistent with CC and CXX and moves > the -MD to CFLAGS, as suggested by Jiri in the thread above. > > Signed-off-by: David Carrillo-Cisneros <davidcc@google.com> > --- > tools/build/feature/Makefile | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile > index 523e587fe05f..e35e4e5ad192 100644 > --- a/tools/build/feature/Makefile > +++ b/tools/build/feature/Makefile > @@ -53,17 +53,17 @@ FILES= \ > > FILES := $(addprefix $(OUTPUT),$(FILES)) > > -CC ?= $(CROSS_COMPILE)gcc -MD > -CXX ?= $(CROSS_COMPILE)g++ -MD > -PKG_CONFIG := $(CROSS_COMPILE)pkg-config > +CC ?= $(CROSS_COMPILE)gcc > +CXX ?= $(CROSS_COMPILE)g++ > +PKG_CONFIG ?= $(CROSS_COMPILE)pkg-config > LLVM_CONFIG ?= llvm-config > > all: $(FILES) > > -__BUILD = $(CC) $(CFLAGS) -Wall -Werror -o $@ $(patsubst %.bin,%.c,$(@F)) $(LDFLAGS) > +__BUILD = $(CC) $(CFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.c,$(@F)) $(LDFLAGS) > BUILD = $(__BUILD) > $(@:.bin=.make.output) 2>&1 > > -__BUILDXX = $(CXX) $(CXXFLAGS) -Wall -Werror -o $@ $(patsubst %.bin,%.cpp,$(@F)) $(LDFLAGS) > +__BUILDXX = $(CXX) $(CXXFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.cpp,$(@F)) $(LDFLAGS) > BUILDXX = $(__BUILDXX) > $(@:.bin=.make.output) 2>&1 > > ############################### > -- > 2.12.2.715.g7642488e1d-goog >
| |