From c1980cc7aa8cd9d1c7c6f09c2d6c955c345e0db7 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 11 May 2015 10:10:25 +0300 Subject: [PATCH] Make possible disable Address Sanitizer. --HG-- branch : develop --- Valentina.pri | 3 +- src/app/app.pro | 25 +++++++++------- src/libs/ifc/ifc.pro | 21 +++++++++----- src/libs/qmuparser/qmuparser.pro | 21 +++++++++----- src/libs/vgeometry/vgeometry.pro | 21 +++++++++----- src/libs/vlayout/vlayout.pro | 21 +++++++++----- src/libs/vobj/vobj.pro | 21 +++++++++----- .../vpropertyexplorer/vpropertyexplorer.pro | 29 +++++++++++-------- src/test/ParserTest/ParserTest.pro | 17 +++++++---- src/test/ValentinaTest/ValentinaTest.pro | 13 ++++++--- 10 files changed, 118 insertions(+), 74 deletions(-) diff --git a/Valentina.pri b/Valentina.pri index 3f7536079..b8805e7ed 100644 --- a/Valentina.pri +++ b/Valentina.pri @@ -168,8 +168,7 @@ GCC_DEBUG_CXXFLAGS += \ -Wstrict-overflow=5 \ -Wundef \ -Wno-unused \ - -ftrapv \ - -fsanitize=address #gcc’s 4.8.0 Address Sanitizer + -ftrapv # Usefull Clang warnings keys. CLANG_DEBUG_CXXFLAGS += \ diff --git a/src/app/app.pro b/src/app/app.pro index 7539791be..f60a0ff74 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -81,17 +81,22 @@ CONFIG(debug, debug|release){ unix { #Turn on compilers warnings. *-g++{ - QMAKE_CXXFLAGS += \ - # Key -isystem disable checking errors in system headers. - -isystem "$${OUT_PWD}/$${UI_DIR}" \ - -isystem "$${OUT_PWD}/$${MOC_DIR}" \ - -isystem "$${OUT_PWD}/$${RCC_DIR}" \ - $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + QMAKE_CXXFLAGS += \ + # Key -isystem disable checking errors in system headers. + -isystem "$${OUT_PWD}/$${UI_DIR}" \ + -isystem "$${OUT_PWD}/$${MOC_DIR}" \ + -isystem "$${OUT_PWD}/$${RCC_DIR}" \ + $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. - #gcc’s 4.8.0 Address Sanitizer - #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ - QMAKE_CFLAGS+=-fsanitize=address -fno-omit-frame-pointer - QMAKE_LFLAGS+=-fsanitize=address + noAddressSanitizer{ + # do nothing + } else { + #gcc’s 4.8.0 Address Sanitizer + #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ + QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_LFLAGS += -fsanitize=address + } } clang*{ QMAKE_CXXFLAGS += \ diff --git a/src/libs/ifc/ifc.pro b/src/libs/ifc/ifc.pro index 04f3efe70..a983e2d07 100644 --- a/src/libs/ifc/ifc.pro +++ b/src/libs/ifc/ifc.pro @@ -59,15 +59,20 @@ CONFIG(debug, debug|release){ unix { #Turn on compilers warnings. *-g++{ - QMAKE_CXXFLAGS += \ - # Key -isystem disable checking errors in system headers. - -isystem "$${OUT_PWD}/$${MOC_DIR}" \ - $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + QMAKE_CXXFLAGS += \ + # Key -isystem disable checking errors in system headers. + -isystem "$${OUT_PWD}/$${MOC_DIR}" \ + $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. - #gcc’s 4.8.0 Address Sanitizer - #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ - QMAKE_CFLAGS+=-fsanitize=address -fno-omit-frame-pointer - QMAKE_LFLAGS+=-fsanitize=address + noAddressSanitizer{ + # do nothing + } else { + #gcc’s 4.8.0 Address Sanitizer + #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ + QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_LFLAGS += -fsanitize=address + } } clang*{ QMAKE_CXXFLAGS += \ diff --git a/src/libs/qmuparser/qmuparser.pro b/src/libs/qmuparser/qmuparser.pro index cb85758f9..ab6df79fb 100644 --- a/src/libs/qmuparser/qmuparser.pro +++ b/src/libs/qmuparser/qmuparser.pro @@ -70,15 +70,20 @@ CONFIG(debug, debug|release){ unix { #Turn on compilers warnings. *-g++{ - QMAKE_CXXFLAGS += \ - # Key -isystem disable checking errors in system headers. - -isystem "$${OUT_PWD}/$${MOC_DIR}" \ - $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + QMAKE_CXXFLAGS += \ + # Key -isystem disable checking errors in system headers. + -isystem "$${OUT_PWD}/$${MOC_DIR}" \ + $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. - #gcc’s 4.8.0 Address Sanitizer - #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ - QMAKE_CFLAGS+=-fsanitize=address -fno-omit-frame-pointer - QMAKE_LFLAGS+=-fsanitize=address + noAddressSanitizer{ + # do nothing + } else { + #gcc’s 4.8.0 Address Sanitizer + #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ + QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_LFLAGS += -fsanitize=address + } } clang*{ QMAKE_CXXFLAGS += \ diff --git a/src/libs/vgeometry/vgeometry.pro b/src/libs/vgeometry/vgeometry.pro index 51e305e48..9bf271001 100644 --- a/src/libs/vgeometry/vgeometry.pro +++ b/src/libs/vgeometry/vgeometry.pro @@ -49,15 +49,20 @@ CONFIG(debug, debug|release){ unix { #Turn on compilers warnings. *-g++{ - QMAKE_CXXFLAGS += \ - # Key -isystem disable checking errors in system headers. - -isystem "$${OUT_PWD}/$${MOC_DIR}" \ - $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + QMAKE_CXXFLAGS += \ + # Key -isystem disable checking errors in system headers. + -isystem "$${OUT_PWD}/$${MOC_DIR}" \ + $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. - #gcc’s 4.8.0 Address Sanitizer - #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ - QMAKE_CFLAGS+=-fsanitize=address -fno-omit-frame-pointer - QMAKE_LFLAGS+=-fsanitize=address + noAddressSanitizer{ + # do nothing + } else { + #gcc’s 4.8.0 Address Sanitizer + #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ + QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_LFLAGS += -fsanitize=address + } } clang*{ QMAKE_CXXFLAGS += \ diff --git a/src/libs/vlayout/vlayout.pro b/src/libs/vlayout/vlayout.pro index 1e49cda60..4803823ba 100644 --- a/src/libs/vlayout/vlayout.pro +++ b/src/libs/vlayout/vlayout.pro @@ -51,15 +51,20 @@ CONFIG(debug, debug|release){ unix { #Turn on compilers warnings. *-g++{ - QMAKE_CXXFLAGS += \ - # Key -isystem disable checking errors in system headers. - -isystem "$${OUT_PWD}/$${MOC_DIR}" \ - $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + QMAKE_CXXFLAGS += \ + # Key -isystem disable checking errors in system headers. + -isystem "$${OUT_PWD}/$${MOC_DIR}" \ + $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. - #gcc’s 4.8.0 Address Sanitizer - #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ - QMAKE_CFLAGS+=-fsanitize=address -fno-omit-frame-pointer - QMAKE_LFLAGS+=-fsanitize=address + noAddressSanitizer{ + # do nothing + } else { + #gcc’s 4.8.0 Address Sanitizer + #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ + QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_LFLAGS += -fsanitize=address + } } clang*{ QMAKE_CXXFLAGS += \ diff --git a/src/libs/vobj/vobj.pro b/src/libs/vobj/vobj.pro index 9625923fb..4bb092501 100644 --- a/src/libs/vobj/vobj.pro +++ b/src/libs/vobj/vobj.pro @@ -49,15 +49,20 @@ CONFIG(debug, debug|release){ unix { #Turn on compilers warnings. *-g++{ - QMAKE_CXXFLAGS += \ - # Key -isystem disable checking errors in system headers. - -isystem "$${OUT_PWD}/$${MOC_DIR}" \ - $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + QMAKE_CXXFLAGS += \ + # Key -isystem disable checking errors in system headers. + -isystem "$${OUT_PWD}/$${MOC_DIR}" \ + $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. - #gcc’s 4.8.0 Address Sanitizer - #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ - QMAKE_CFLAGS+=-fsanitize=address -fno-omit-frame-pointer - QMAKE_LFLAGS+=-fsanitize=address + noAddressSanitizer{ + # do nothing + } else { + #gcc’s 4.8.0 Address Sanitizer + #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ + QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_LFLAGS += -fsanitize=address + } } clang*{ QMAKE_CXXFLAGS += \ diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer.pro b/src/libs/vpropertyexplorer/vpropertyexplorer.pro index 131e906d6..8e7a71c68 100644 --- a/src/libs/vpropertyexplorer/vpropertyexplorer.pro +++ b/src/libs/vpropertyexplorer/vpropertyexplorer.pro @@ -68,20 +68,25 @@ CONFIG(debug, debug|release){ unix { #Turn on compilers warnings. *-g++{ - QMAKE_CXXFLAGS += \ - -isystem "$${OUT_PWD}/$${MOC_DIR}" \ - # Key -isystem disable checking errors in system headers. - $$GCC_DEBUG_CXXFLAGS \ # See Valentina.pri for more details. + QMAKE_CXXFLAGS += \ + -isystem "$${OUT_PWD}/$${MOC_DIR}" \ + # Key -isystem disable checking errors in system headers. + $$GCC_DEBUG_CXXFLAGS \ # See Valentina.pri for more details. - # -isystem key works only for headers. In some cases it's not enough. But we can't delete this warnings and - # want them in global list. Compromise decision delete them from local list. - QMAKE_CXXFLAGS -= \ - -Wswitch-default + # -isystem key works only for headers. In some cases it's not enough. But we can't delete this warnings and + # want them in global list. Compromise decision delete them from local list. + QMAKE_CXXFLAGS -= \ + -Wswitch-default - #gcc’s 4.8.0 Address Sanitizer - #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ - QMAKE_CFLAGS+=-fsanitize=address -fno-omit-frame-pointer - QMAKE_LFLAGS+=-fsanitize=address + noAddressSanitizer{ + # do nothing + } else { + #gcc’s 4.8.0 Address Sanitizer + #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ + QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_LFLAGS += -fsanitize=address + } } clang*{ diff --git a/src/test/ParserTest/ParserTest.pro b/src/test/ParserTest/ParserTest.pro index 76b3126f7..3a4e96432 100644 --- a/src/test/ParserTest/ParserTest.pro +++ b/src/test/ParserTest/ParserTest.pro @@ -51,13 +51,18 @@ CONFIG(debug, debug|release){ unix { #Turn on compilers warnings. *-g++{ - QMAKE_CXXFLAGS += \ - $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + QMAKE_CXXFLAGS += \ + $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. - #gcc’s 4.8.0 Address Sanitizer - #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ - QMAKE_CFLAGS+=-fsanitize=address -fno-omit-frame-pointer - QMAKE_LFLAGS+=-fsanitize=address + noAddressSanitizer{ + # do nothing + } else { + #gcc’s 4.8.0 Address Sanitizer + #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ + QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_LFLAGS += -fsanitize=address + } } clang*{ QMAKE_CXXFLAGS += \ diff --git a/src/test/ValentinaTest/ValentinaTest.pro b/src/test/ValentinaTest/ValentinaTest.pro index 5a51fee7e..be0b18382 100644 --- a/src/test/ValentinaTest/ValentinaTest.pro +++ b/src/test/ValentinaTest/ValentinaTest.pro @@ -58,10 +58,15 @@ CONFIG(debug, debug|release){ -isystem "$${OUT_PWD}/$${RCC_DIR}" \ $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. - #gcc’s 4.8.0 Address Sanitizer - #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ - QMAKE_CFLAGS+=-fsanitize=address -fno-omit-frame-pointer - QMAKE_LFLAGS+=-fsanitize=address + noAddressSanitizer{ + # do nothing + } else { + #gcc’s 4.8.0 Address Sanitizer + #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ + QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_LFLAGS += -fsanitize=address + } } clang*{ QMAKE_CXXFLAGS += \