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

support CC envvar to be in the form "command args..." (#4582)

Browse source 
In case CC is set try to split it by spaces into a command and
arguments. This is the same behaviour as in dmd.

Signed-off-by: Andrei Horodniceanu <a.horodniceanu@proton.me>
This commit is contained in:
Andrei Horodniceanu 2024-02-24 15:46:35 +00:00 • committed by GitHub
parent 17074a4422
commit d7f87811f6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 45 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
driver/cpreprocessor.cpp
View file

@ -22,9 +22,11 @@ const char *getPathToImportc_h(const Loc &loc) {
return cached;
}
const std::string &getCC(bool isMSVC) {
static std::string cached;
if (cached.empty()) {
const std::string &getCC(bool isMSVC,
std::vector<std::string> &additional_args) {
static std::string cached_cc;
static std::vector<std::string> cached_args;
if (cached_cc.empty()) {
std::string fallback = "cc";
if (isMSVC) {
#ifdef _WIN32
@ -40,9 +42,11 @@ const std::string &getCC(bool isMSVC) {
fallback = "clang-cl";
#endif
}
cached = getGcc(fallback.c_str());
cached_cc = getGcc(cached_args, fallback.c_str());
}
return cached;
additional_args.insert(additional_args.end(), cached_args.cbegin(), cached_args.cend());
return cached_cc;
}
FileName getOutputPath(const Loc &loc, const char *csrcfile) {
@ -84,8 +88,8 @@ FileName runCPreprocessor(FileName csrcfile, const Loc &loc, bool &ifile,
FileName ipath = getOutputPath(loc, csrcfile.toChars());
const std::string &cc = getCC(isMSVC);
std::vector<std::string> args;
const std::string &cc = getCC(isMSVC, args);
if (!isMSVC)
appendTargetArgsForGcc(args);