Skip to content

Commit f5153ac

Browse files
K-balloK-ballo
committed
more
1 parent 60ce5f9 commit f5153ac

File tree

5 files changed

+4
-87
lines changed

5 files changed

+4
-87
lines changed

‎docs/config-headers/include/mrdocs/PublicSettings.hpp‎

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -888,39 +888,6 @@ struct PublicSettings {
888888
*/
889889
std::vector<std::string> defines;
890890

891-
/** Use the system C++ standard library
892-
893-
To achieve reproducible results, MrDocs bundles the LibC++ headers.
894-
895-
To use the C++ standard library available in the system instead, set
896-
this option to true.
897-
*/
898-
bool useSystemStdlib = false;
899-
900-
/** C++ Standard Library include paths
901-
902-
When `use-system-stdlib` is disabled, the C++ standard library headers
903-
are available in these paths.
904-
*/
905-
std::vector<std::string> stdlibIncludes;
906-
907-
/** Use the system C standard library
908-
909-
To achieve reproducible results, MrDocs bundles the LibC headers with
910-
its definitions.
911-
912-
To use the C standard library available in the system instead, set
913-
this option to true.
914-
*/
915-
bool useSystemLibc = false;
916-
917-
/** Standard Library include paths
918-
919-
When `use-system-libc` is disabled, the C standard library headers are
920-
available in these paths.
921-
*/
922-
std::vector<std::string> libcIncludes;
923-
924891
/** System include paths
925892
926893
System include paths.
@@ -1653,10 +1620,6 @@ struct PublicSettings {
16531620
std::forward<F>(f)("global-namespace-index", globalNamespaceIndex);
16541621
std::forward<F>(f)("cmake", cmake);
16551622
std::forward<F>(f)("defines", defines);
1656-
std::forward<F>(f)("use-system-stdlib", useSystemStdlib);
1657-
std::forward<F>(f)("stdlib-includes", stdlibIncludes);
1658-
std::forward<F>(f)("use-system-libc", useSystemLibc);
1659-
std::forward<F>(f)("libc-includes", libcIncludes);
16601623
std::forward<F>(f)("system-includes", systemIncludes);
16611624
std::forward<F>(f)("includes", includes);
16621625
std::forward<F>(f)("verbose", verbose);
@@ -1734,10 +1697,6 @@ struct PublicSettings {
17341697
std::forward<F>(f)("global-namespace-index", globalNamespaceIndex);
17351698
std::forward<F>(f)("cmake", cmake);
17361699
std::forward<F>(f)("defines", defines);
1737-
std::forward<F>(f)("use-system-stdlib", useSystemStdlib);
1738-
std::forward<F>(f)("stdlib-includes", stdlibIncludes);
1739-
std::forward<F>(f)("use-system-libc", useSystemLibc);
1740-
std::forward<F>(f)("libc-includes", libcIncludes);
17411700
std::forward<F>(f)("system-includes", systemIncludes);
17421701
std::forward<F>(f)("includes", includes);
17431702
std::forward<F>(f)("verbose", verbose);

‎docs/config-headers/src/tool/PublicToolArgs.hpp‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -744,39 +744,6 @@ struct PublicToolArgs {
744744
*/
745745
llvm::cl::list<std::string> defines;
746746

747-
/** Use the system C++ standard library
748-
749-
To achieve reproducible results, MrDocs bundles the LibC++ headers.
750-
751-
To use the C++ standard library available in the system instead, set
752-
this option to true.
753-
*/
754-
llvm::cl::opt<bool> useSystemStdlib;
755-
756-
/** C++ Standard Library include paths
757-
758-
When `use-system-stdlib` is disabled, the C++ standard library headers
759-
are available in these paths.
760-
*/
761-
llvm::cl::list<std::string> stdlibIncludes;
762-
763-
/** Use the system C standard library
764-
765-
To achieve reproducible results, MrDocs bundles the LibC headers with
766-
its definitions.
767-
768-
To use the C standard library available in the system instead, set
769-
this option to true.
770-
*/
771-
llvm::cl::opt<bool> useSystemLibc;
772-
773-
/** Standard Library include paths
774-
775-
When `use-system-libc` is disabled, the C standard library headers are
776-
available in these paths.
777-
*/
778-
llvm::cl::list<std::string> libcIncludes;
779-
780747
/** System include paths
781748
782749
System include paths.
@@ -994,10 +961,6 @@ struct PublicToolArgs {
994961
std::forward<F>(f)("global-namespace-index", globalNamespaceIndex);
995962
std::forward<F>(f)("cmake", cmake);
996963
std::forward<F>(f)("defines", defines);
997-
std::forward<F>(f)("use-system-stdlib", useSystemStdlib);
998-
std::forward<F>(f)("stdlib-includes", stdlibIncludes);
999-
std::forward<F>(f)("use-system-libc", useSystemLibc);
1000-
std::forward<F>(f)("libc-includes", libcIncludes);
1001964
std::forward<F>(f)("system-includes", systemIncludes);
1002965
std::forward<F>(f)("includes", includes);
1003966
std::forward<F>(f)("verbose", verbose);

‎src/tool/CompilerInfo.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,8 @@ parseIncludePaths(std::string const& compilerOutput)
8282
}
8383

8484
std::unordered_map<std::string, std::vector<std::string>>
85-
getCompilersDefaultIncludeDir(clang::tooling::CompilationDatabase const& compDb, bool useSystemStdlib)
85+
getCompilersDefaultIncludeDir(clang::tooling::CompilationDatabase const& compDb)
8686
{
87-
if (!useSystemStdlib)
88-
{
89-
return {};
90-
}
9187
std::unordered_map<std::string, std::vector<std::string>> res;
9288
auto const allCommands = compDb.getAllCompileCommands();
9389

‎src/tool/CompilerInfo.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,10 @@ parseIncludePaths(std::string const& compilerOutput);
4444
* @brief Get the compiler default include dir.
4545
*
4646
* @param compDb The compilation database.
47-
* @param useSystemStdlib True if the compiler has to use just the system standard library.
4847
* @return std::unordered_map<std::string, std::vector<std::string>> The compiler default include dir.
4948
*/
5049
std::unordered_map<std::string, std::vector<std::string>>
51-
getCompilersDefaultIncludeDir(clang::tooling::CompilationDatabase const& compDb, bool useSystemStdlib);
50+
getCompilersDefaultIncludeDir(clang::tooling::CompilationDatabase const& compDb);
5251

5352
} // mrdocs
5453
} // clang

‎src/tool/ToolCompilationDatabase.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ generateCompilationDatabase(
102102
{
103103
MrDocsSettingsDB compilationDB{*config};
104104
auto const defaultIncludePaths = getCompilersDefaultIncludeDir(
105-
compilationDB, (*config)->useSystemStdlib);
105+
compilationDB);
106106
MrDocsCompilationDatabase compilationDatabase(
107107
settings.sourceRoot,
108108
compilationDB,
@@ -149,7 +149,7 @@ generateCompilationDatabase(
149149

150150
// Custom compilation database that applies settings from the configuration
151151
auto const defaultIncludePaths = getCompilersDefaultIncludeDir(
152-
jsonDatabase, (*config)->useSystemStdlib);
152+
jsonDatabase);
153153
auto compileCommandsDir = files::getParentDir(compileCommandsPath);
154154
MrDocsCompilationDatabase compilationDatabase(
155155
compileCommandsDir,

0 commit comments

Comments
 (0)