ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: fixed case where clang target flag was "---"

Browse Source
This commit is contained in:
malte_langkabel
2017-08-11 11:31:28 +02:00
parent 9d1faa791b
commit ddebf71e02
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/settings/SourceGroupSettingsCxx.cpp
+9 -8
View File
@@ -148,6 +148,11 @@ SourceGroupSettingsCxx::SourceGroupSettingsCxx(const std::string& id, SourceGrou
, m_useSourcePathsForHeaderSearch(false) , m_useSourcePathsForHeaderSearch(false)
, m_hasDefinedUseSourcePathsForHeaderSearch(false) , m_hasDefinedUseSourcePathsForHeaderSearch(false)
, m_compilationDatabasePath(FilePath()) , m_compilationDatabasePath(FilePath())
, m_targetOptionsEnabled(false)
, m_targetArch("")
, m_targetVendor("")
, m_targetSys("")
, m_targetAbi("")
{ {
} }
@@ -318,17 +323,13 @@ void SourceGroupSettingsCxx::setTargetAbi(const std::string& abi)
std::string SourceGroupSettingsCxx::getTargetFlag() const std::string SourceGroupSettingsCxx::getTargetFlag() const
{ {
std::string targetFlag = ""; std::string targetFlag = "";
if (m_targetOptionsEnabled) if (m_targetOptionsEnabled && !m_targetArch.empty())
{ {
targetFlag = "--target="; targetFlag = "--target=";
targetFlag += m_targetArch; targetFlag += m_targetArch;
if (!m_targetSub.empty()) targetFlag += "-" + m_targetVendor.empty() ? "unknown" : m_targetVendor;
{ targetFlag += "-" + m_targetSys.empty() ? "unknown" : m_targetSys;
targetFlag += m_targetSub; targetFlag += "-" + m_targetAbi.empty() ? "unknown" : m_targetAbi;
}
targetFlag += "-" + m_targetVendor;
targetFlag += "-" + m_targetSys;
targetFlag += "-" + m_targetAbi;
} }
return targetFlag; return targetFlag;
} }
src/lib/settings/SourceGroupSettingsCxx.h
-1
View File
@@ -69,7 +69,6 @@ private:
std::vector<FilePath> m_frameworkSearchPaths; std::vector<FilePath> m_frameworkSearchPaths;
bool m_targetOptionsEnabled; bool m_targetOptionsEnabled;
std::string m_targetArch; std::string m_targetArch;
std::string m_targetSub;
std::string m_targetVendor; std::string m_targetVendor;
std::string m_targetSys; std::string m_targetSys;
std::string m_targetAbi; std::string m_targetAbi;