From e1fd003e2d1cc114d165738da614fb4af22d9973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Wed, 15 May 2013 13:04:19 +0200 Subject: [PATCH] makefile: make it possible to turn on matchcompiler verifications with 'VERIFY=1' --- Makefile | 6 +++++- tools/dmake.cpp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 08ddb56e1..da6a00e4d 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,11 @@ ifndef SRCDIR endif ifeq ($(SRCDIR),build) - matchcompiler_S := $(shell python tools/matchcompiler.py) + ifdef VERIFY + matchcompiler_S := $(shell python tools/matchcompiler.py --verify) + else + matchcompiler_S := $(shell python tools/matchcompiler.py) + endif endif # Set the CPPCHK_GLIBCXX_DEBUG flag. This flag is not used in release Makefiles. diff --git a/tools/dmake.cpp b/tools/dmake.cpp index ddb4b5e79..fe384f64e 100644 --- a/tools/dmake.cpp +++ b/tools/dmake.cpp @@ -234,7 +234,11 @@ int main(int argc, char **argv) fout << "# folder where lib/*.cpp files are located\n"; makeConditionalVariable(fout, "SRCDIR", "lib"); fout << "ifeq ($(SRCDIR),build)\n" - << " matchcompiler_S := $(shell python tools/matchcompiler.py)\n" + << " ifdef VERIFY\n" + << " matchcompiler_S := $(shell python tools/matchcompiler.py --verify)\n" + << " else\n" + << " matchcompiler_S := $(shell python tools/matchcompiler.py)\n" + << " endif\n" << "endif\n\n"; // The _GLIBCXX_DEBUG doesn't work in cygwin or other Win32 systems.