aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/shared/clang/clang_installation.pri6
-rw-r--r--tests/unit/unittest/clang_dependency.pri3
2 files changed, 4 insertions, 5 deletions
diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri
index 89a400045f..6d37719384 100644
--- a/src/shared/clang/clang_installation.pri
+++ b/src/shared/clang/clang_installation.pri
@@ -111,11 +111,13 @@ LLVM_CXXFLAGS = $$system($$llvm_config --cxxflags, lines)
LLVM_CXXFLAGS ~= s,-fno-exceptions,
LLVM_CXXFLAGS ~= s,-std=c++11,
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,/EHc-,
+LLVM_CXXFLAGS ~= s,/EH\S*,
LLVM_CXXFLAGS ~= s,-Werror=date-time,
LLVM_CXXFLAGS ~= s,-fPIC,
+LLVM_CXXFLAGS ~= s,-pedantic,
# split-dwarf needs objcopy which does not work via icecc out-of-the-box
LLVM_CXXFLAGS ~= s,-gsplit-dwarf,
diff --git a/tests/unit/unittest/clang_dependency.pri b/tests/unit/unittest/clang_dependency.pri
index 0235238b74..354ebd0c90 100644
--- a/tests/unit/unittest/clang_dependency.pri
+++ b/tests/unit/unittest/clang_dependency.pri
@@ -21,9 +21,6 @@ LIBS += $$LIBTOOLING_LIBS $$LIBCLANG_LIBS
QMAKE_RPATHDIR += $$LLVM_LIBDIR
LLVM_CXXFLAGS ~= s,-g,
-LLVM_CXXFLAGS ~= s,-O2,
-LLVM_CXXFLAGS ~= s,-O3,
-LLVM_CXXFLAGS ~= s,-pedantic,
QMAKE_CXXFLAGS += $$LLVM_CXXFLAGS
}