mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-04-30 23:20:40 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Windows: Prefer clang-cl.exe over cl.exe for C preprocessing

Browse source
This commit is contained in:
Martin Kinkelin 2023-06-05 21:05:54 +02:00
parent 1bf7e28c59
commit cf74b3d555
1 changed files with 47 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

51
driver/cpreprocessor.cpp
View file

@ -3,6 +3,7 @@
#include "dmd/errors.h"
#include "driver/cl_options.h"
#include "driver/tool.h"
#include "llvm/Support/Program.h"
namespace {
const char *getPathToImportc_h(const Loc &loc) {
@ -17,6 +18,29 @@ const char *getPathToImportc_h(const Loc &loc) {
}
return cached;
}
const std::string &getCC(bool isMSVC) {
static std::string cached;
if (cached.empty()) {
std::string fallback = "cc";
if (isMSVC) {
#ifdef _WIN32
// by default, prefer clang-cl.exe (if in PATH) over cl.exe
// (e.g., no echoing of source filename being preprocessed to stderr)
auto found = llvm::sys::findProgramByName("clang-cl.exe");
if (found) {
fallback = found.get();
} else {
fallback = "cl.exe";
}
#else
fallback = "clang-cl";
#endif
}
cached = getGcc(fallback.c_str());
}
return cached;
}
} // anonymous namespace
FileName runCPreprocessor(FileName csrcfile, const Loc &loc, bool &ifile,
@ -34,7 +58,7 @@ FileName runCPreprocessor(FileName csrcfile, const Loc &loc, bool &ifile,
msvcEnv.setup();
#endif
const std::string cc = getGcc(isMSVC ? "cl.exe" : "cc");
const std::string &cc = getCC(isMSVC);
std::vector<std::string> args;
if (!isMSVC)
@ -51,10 +75,29 @@ FileName runCPreprocessor(FileName csrcfile, const Loc &loc, bool &ifile,
}
if (isMSVC) {
args.push_back("/P"); // run preprocessor
args.push_back("/Zc:preprocessor"); // use the new conforming preprocessor
args.push_back("/PD"); // undocumented: print all macro definitions
args.push_back("/nologo");
args.push_back("/P"); // preprocess only
const bool isClangCl = llvm::StringRef(cc)
#if LDC_LLVM_VER >= 1300
.contains_insensitive("clang-cl");
#else
.contains_lower("clang-cl");
#endif
if (!isClangCl) {
args.push_back("/PD"); // print all macro definitions
args.push_back("/Zc:preprocessor"); // use the new conforming preprocessor
} else {
// print macro definitions (clang-cl doesn't support /PD - use clang's
// -dD)
args.push_back("-Xclang");
args.push_back("-dD");
// need to redefine some macros in importc.h
args.push_back("-Wno-builtin-macro-redefined");
}
args.push_back(csrcfile.toChars());
args.push_back((llvm::Twine("/FI") + importc_h).str());
// preprocessed output file