feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Filter exception flags and move some more

Browse Source 
Change-Id: I3ef6a6bb2297d6965c5c1d457cfe2b354ee3dcdb
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Tim Jenssen
2017-02-01 12:19:11 +01:00
parent 4d9dfc79e1
commit 63e7e83e22
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/shared/clang/clang_installation.pri
View File

@@ -111,11 +111,13 @@ LLVM_CXXFLAGS = $$system($$llvm_config --cxxflags, lines)
LLVM_CXXFLAGS ~= s,-fno-exceptions, LLVM_CXXFLAGS ~= s,-fno-exceptions,
LLVM_CXXFLAGS ~= s,-std=c++11, LLVM_CXXFLAGS ~= s,-std=c++11,
LLVM_CXXFLAGS ~= s,-std=c++0x, LLVM_CXXFLAGS ~= s,-std=c++0x,
LLVM_CXXFLAGS ~= s,-O2, LLVM_CXXFLAGS ~= s,-O\S*,
LLVM_CXXFLAGS ~= s,/O\S*,
LLVM_CXXFLAGS ~= s,/W4, LLVM_CXXFLAGS ~= s,/W4,
LLVM_CXXFLAGS ~= s,/EHc-, LLVM_CXXFLAGS ~= s,/EH\S*,
LLVM_CXXFLAGS ~= s,-Werror=date-time, LLVM_CXXFLAGS ~= s,-Werror=date-time,
LLVM_CXXFLAGS ~= s,-fPIC, LLVM_CXXFLAGS ~= s,-fPIC,
LLVM_CXXFLAGS ~= s,-pedantic,
# split-dwarf needs objcopy which does not work via icecc out-of-the-box # split-dwarf needs objcopy which does not work via icecc out-of-the-box
LLVM_CXXFLAGS ~= s,-gsplit-dwarf, LLVM_CXXFLAGS ~= s,-gsplit-dwarf,

3
tests/unit/unittest/clang_dependency.pri
View File

@@ -21,9 +21,6 @@ LIBS += $$LIBTOOLING_LIBS $$LIBCLANG_LIBS
QMAKE_RPATHDIR += $$LLVM_LIBDIR QMAKE_RPATHDIR += $$LLVM_LIBDIR
LLVM_CXXFLAGS ~= s,-g, LLVM_CXXFLAGS ~= s,-g,
LLVM_CXXFLAGS ~= s,-O2,
LLVM_CXXFLAGS ~= s,-O3,
LLVM_CXXFLAGS ~= s,-pedantic,
QMAKE_CXXFLAGS += $$LLVM_CXXFLAGS QMAKE_CXXFLAGS += $$LLVM_CXXFLAGS
} }