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

Clang: Stop enabling exceptions explicitly

Browse Source 
According to commit e2e3be09e3 this was
needed for clang 3.8.0 on Windows.

Change-Id: I4f2c2bf31449d9613607e57524c7ff6e4577812a
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-01-08 15:57:53 +01:00
parent 336a3c14c0
commit b114f77d8a
3 changed files with 2 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/cpptools/compileroptionsbuilder.cpp
View File

@@ -112,7 +112,6 @@ QStringList CompilerOptionsBuilder::build(ProjectFile::Kind fileKind,
updateLanguageOption(fileKind); updateLanguageOption(fileKind);
addOptionsForLanguage(/*checkForBorlandExtensions*/ true); addOptionsForLanguage(/*checkForBorlandExtensions*/ true);
enableExceptions();
addToolchainAndProjectMacros(); addToolchainAndProjectMacros();
undefineClangVersionMacrosForMsvc(); undefineClangVersionMacrosForMsvc();
@@ -215,13 +214,6 @@ void CompilerOptionsBuilder::addExtraCodeModelFlags()
m_options.append(m_projectPart.extraCodeModelFlags); m_options.append(m_projectPart.extraCodeModelFlags);
} }
void CompilerOptionsBuilder::enableExceptions()
{
if (m_projectPart.languageVersion > ProjectExplorer::LanguageVersion::LatestC)
add("-fcxx-exceptions");
add("-fexceptions");
}
static QString creatorResourcePath() static QString creatorResourcePath()
{ {
#ifndef UNIT_TESTS #ifndef UNIT_TESTS

1
src/plugins/cpptools/compileroptionsbuilder.h
View File

@@ -61,7 +61,6 @@ public:
void addTargetTriple(); void addTargetTriple();
void addExtraCodeModelFlags(); void addExtraCodeModelFlags();
void enableExceptions();
void insertWrappedQtHeaders(); void insertWrappedQtHeaders();
void addOptionsForLanguage(bool checkForBorlandExtensions = true); void addOptionsForLanguage(bool checkForBorlandExtensions = true);
void updateLanguageOption(ProjectFile::Kind fileKind); void updateLanguageOption(ProjectFile::Kind fileKind);

21
tests/unit/unittest/compileroptionsbuilder-test.cpp
View File

@@ -355,22 +355,6 @@ TEST_F(CompilerOptionsBuilder, AddTargetTriple)
ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-target", "x86_64-apple-darwin10")); ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-target", "x86_64-apple-darwin10"));
} }
TEST_F(CompilerOptionsBuilder, EnableCExceptions)
{
projectPart.languageVersion = ProjectExplorer::LanguageVersion::C99;
compilerOptionsBuilder.enableExceptions();
ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-fexceptions"));
}
TEST_F(CompilerOptionsBuilder, EnableCXXExceptions)
{
compilerOptionsBuilder.enableExceptions();
ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-fcxx-exceptions", "-fexceptions"));
}
TEST_F(CompilerOptionsBuilder, InsertWrappedQtHeaders) TEST_F(CompilerOptionsBuilder, InsertWrappedQtHeaders)
{ {
compilerOptionsBuilder.insertWrappedQtHeaders(); compilerOptionsBuilder.insertWrappedQtHeaders();
@@ -457,9 +441,8 @@ TEST_F(CompilerOptionsBuilder, BuildAllOptions)
ASSERT_THAT(compilerOptionsBuilder.options(), ASSERT_THAT(compilerOptionsBuilder.options(),
ElementsAre( ElementsAre(
"-nostdlibinc", "-c", "-m64", "-target", "x86_64-apple-darwin10", "-nostdlibinc", "-c", "-m64", "-target", "x86_64-apple-darwin10",
"-arch", "x86_64", "-x", "c++", "-std=c++17", "-fcxx-exceptions", "-arch", "x86_64", "-x", "c++", "-std=c++17", "-Dfoo=bar",
"-fexceptions", "-Dfoo=bar", "-DprojectFoo=projectBar", "-DprojectFoo=projectBar", "-undef",
"-undef",
"-I", IsPartOfHeader("wrappedQtHeaders"), "-I", IsPartOfHeader("wrappedQtHeaders"),
"-I", IsPartOfHeader(QDir::toNativeSeparators("wrappedQtHeaders/QtCore").toStdString()), "-I", IsPartOfHeader(QDir::toNativeSeparators("wrappedQtHeaders/QtCore").toStdString()),
"-I", QDir::toNativeSeparators("/tmp/path"), "-I", QDir::toNativeSeparators("/tmp/path"),