diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2018-11-14 23:52:34 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2018-11-15 08:57:34 +0000 |
| commit | 0ed6409618da9d7fa4f4250ab8bb6fa570988c09 (patch) | |
| tree | 3415f905ba0a6d5e432e3b00cb6a3c839d216001 | |
| parent | d2e74499abfeae9c558efe5c67165ddfd041f5d9 (diff) | |
| download | qt-creator-0ed6409618da9d7fa4f4250ab8bb6fa570988c09.tar.gz | |
Clang: Remove duplicate CXX flags
Most of the flags appear twice on llvm-config-7 --cxxflags (at least on
Debian).
Change-Id: I9c5630d61472fa37bce998ec541a0ab561b83722
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
| -rw-r--r-- | src/shared/clang/clang_installation.pri | 2 | ||||
| -rw-r--r-- | tests/unit/unittest/clang_dependency.pri | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri index 8f102279d4..afa21e23ce 100644 --- a/src/shared/clang/clang_installation.pri +++ b/src/shared/clang/clang_installation.pri @@ -216,7 +216,7 @@ isEmpty(LLVM_VERSION) { # Remove unwanted flags. It is a workaround for linking. # It is not intended for cross compiler linking. - LLVM_CXXFLAGS = $$system($$llvm_config --cxxflags, lines) + LLVM_CXXFLAGS *= $$system($$llvm_config --cxxflags, lines) LLVM_CXXFLAGS ~= s,-fno-exceptions, LLVM_CXXFLAGS ~= s,-std=c++11, LLVM_CXXFLAGS ~= s,-std=c++0x, diff --git a/tests/unit/unittest/clang_dependency.pri b/tests/unit/unittest/clang_dependency.pri index 744c9ff428..2c72feadff 100644 --- a/tests/unit/unittest/clang_dependency.pri +++ b/tests/unit/unittest/clang_dependency.pri @@ -22,7 +22,7 @@ include(../../../src/shared/clang/clang_defines.pri) !contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): QMAKE_RPATHDIR += $$LLVM_LIBDIR LLVM_CXXFLAGS ~= s,-g\d?, - QMAKE_CXXFLAGS += $$LLVM_CXXFLAGS + QMAKE_CXXFLAGS *= $$LLVM_CXXFLAGS DEFINES += CLANG_COMPILER_PATH=\"R\\\"xxx($$LLVM_BINDIR/clang)xxx\\\"\" } |