From d564f13e9d8eaf97272830c5e029195cd0f2d5b0 Mon Sep 17 00:00:00 2001 From: Joachim Klein Date: Wed, 2 Aug 2017 11:30:32 +0000 Subject: [PATCH] Makefile: add WARNINGS variable, activate -Wformat We'd like to get format string warning messages. Will be fixed in subsequent commits. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12179 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/Makefile | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/prism/Makefile b/prism/Makefile index 166109c6..f251700a 100644 --- a/prism/Makefile +++ b/prism/Makefile @@ -144,6 +144,9 @@ DEBUG = OPTIMISE = -O3 #OPTIMISE = +# warnings we'd like to get +WARNINGS = -Wformat + # Flags for compilation/linking # Flags to generate shared libraries # Executable/library naming conventions @@ -156,7 +159,7 @@ OPTIMISE = -O3 ifeq ($(OSTYPE),linux) ifeq ($(ARCH),amd64) # Position Independent Code required on AMD64/Itanium - CUDD_XCFLAGS = -m64 -fPIC -DPIC -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 $(DEBUG) + CUDD_XCFLAGS = -m64 -fPIC -DPIC -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 $(DEBUG) $(WARNINGS) CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) CPPFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE) LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) @@ -165,13 +168,13 @@ ifeq ($(OSTYPE),linux) ifeq ($(ARCH),ia64) # Position Independent Code required on AMD64/Itanium # Note: We omit the -m64 flag from here since it seems to be unsupported by gcc on IA64 - CUDD_XCFLAGS = -fPIC -DPIC -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 $(DEBUG) + CUDD_XCFLAGS = -fPIC -DPIC -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 $(DEBUG) $(WARNINGS) CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) CPPFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE) LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) BINDISTSUFFIX = linux64 else - CUDD_XCFLAGS = -m32 -malign-double -DHAVE_IEEE_754 -DBSD $(DEBUG) + CUDD_XCFLAGS = -m32 -malign-double -DHAVE_IEEE_754 -DBSD $(DEBUG) $(WARNINGS) CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) CPPFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE) LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) @@ -190,7 +193,7 @@ ifeq ($(OSTYPE),linux) endif # Solaris ifeq ($(OSTYPE),solaris) - CUDD_XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100 -DEPD_BIG_ENDIAN $(DEBUG) + CUDD_XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100 -DEPD_BIG_ENDIAN $(DEBUG) $(WARNINGS) CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) CPPFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE) LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) @@ -209,7 +212,7 @@ ifeq ($(OSTYPE),cygwin) ifeq ($(ARCH),x86_64) C = /usr/bin/x86_64-w64-mingw32-gcc CPP = /usr/bin/x86_64-w64-mingw32-g++ - CUDD_XCFLAGS = -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=268435456 -DHAVE_SYS_RESOURCE_H=0 -DHAVE_SYS_WAIT_H=0 -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=4 $(DEBUG) -static-libgcc -static-libstdc++ + CUDD_XCFLAGS = -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=268435456 -DHAVE_SYS_RESOURCE_H=0 -DHAVE_SYS_WAIT_H=0 -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=4 $(DEBUG) $(WARNINGS) -static-libgcc -static-libstdc++ CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) # need -DWIN32 for lpsolve (WIN32 is only defined by mingw/gcc without --std=c++11) CPPFLAGS = --std=c++11 -DWIN32 $(CUDD_XCFLAGS) $(OPTIMISE) @@ -218,7 +221,7 @@ ifeq ($(OSTYPE),cygwin) else C = /usr/bin/i686-w64-mingw32-gcc CPP = /usr/bin/i686-w64-mingw32-g++ - CUDD_XCFLAGS = -march=i686 -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=268435456 -DHAVE_SYS_RESOURCE_H=0 -DHAVE_SYS_WAIT_H=0 $(DEBUG) -static-libgcc -static-libstdc++ + CUDD_XCFLAGS = -march=i686 -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=268435456 -DHAVE_SYS_RESOURCE_H=0 -DHAVE_SYS_WAIT_H=0 $(DEBUG) $(WARNINGS) -static-libgcc -static-libstdc++ CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) # need -DWIN32 for lpsolve (WIN32 is only defined by mingw/gcc without --std=c++11) CPPFLAGS = --std=c++11 -DWIN32 $(CUDD_XCFLAGS) $(OPTIMISE) @@ -239,14 +242,14 @@ endif # Darwin ifeq ($(OSTYPE),darwin) ifeq ($(ARCH),x86_64) - CUDD_XCFLAGS = -arch x86_64 -fPIC -DPIC -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -fno-common $(DEBUG) + CUDD_XCFLAGS = -arch x86_64 -fPIC -DPIC -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -fno-common $(DEBUG) $(WARNINGS) CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) CPPFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE) LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) -Wl,-search_paths_first BINDISTSUFFIX = osx64 BIN_TARGETS=prism.darwin64 xprism.linux else - CUDD_XCFLAGS = -arch i386 -DHAVE_IEEE_754 -DBSD -fno-common $(DEBUG) + CUDD_XCFLAGS = -arch i386 -DHAVE_IEEE_754 -DBSD -fno-common $(DEBUG) $(WARNINGS) CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) CPPFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE) LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) -Wl,-search_paths_first