Skip to content

Pass the resolved path of <path>/importc.h/../include to the C preprocessor as an include path. #5169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
just-harry wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −9
Draft

Pass the resolved path of <path>/importc.h/../include to the C preprocessor as an include path. #5169

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 28 additions & 9 deletions driver/cpreprocessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,32 @@
#include "llvm/Target/TargetMachine.h"

namespace {
const char *getPathToImportc_h(Loc loc) {
struct ImportCPaths {
const char *importc_h;
const char *includePath;
};

auto getImportCPaths(Loc loc) -> const ImportCPaths & {
// importc.h should be next to object.d
static const char *cached = nullptr;
if (!cached) {
cached = FileName::searchPath(global.importPaths, "importc.h", false);
if (!cached) {
// include should be next to importc.h
static ImportCPaths cached = {};
if (!cached.importc_h) {
const char *importc_h =
FileName::searchPath(global.importPaths, "importc.h", false);
if (!importc_h) {
error(loc, "cannot find \"importc.h\" along import path");
fatal();
}

#ifdef _WIN32
// if the path to importc.h is relative, cl.exe (but not clang-cl) treats it as relative to the .c file!
cached = FileName::toAbsolute(cached);
// if the path to importc.h is relative, cl.exe (but not clang-cl) treats it
// as relative to the .c file!
importc_h = FileName::toAbsolute(importc_h);
#endif
const auto parentPath = std::string(importc_h, FileName::name(importc_h));
const char *includePath = FileName::combine(parentPath.c_str(), "include");

cached.includePath = includePath;
cached.importc_h = importc_h;
}
return cached;
}
Expand Down Expand Up @@ -55,7 +67,9 @@ FileName getOutputPath(Loc loc, const char *csrcfile) {
FileName runCPreprocessor(FileName csrcfile, Loc loc, OutBuffer &defines) {
dmd::TimeTraceScope timeScope("Preprocess C file", csrcfile.toChars(), loc);

const char *importc_h = getPathToImportc_h(loc);
const ImportCPaths &paths = getImportCPaths(loc);
const char *importc_h = paths.importc_h;
const char *includePath = paths.includePath;

const auto &triple = *global.params.targetTriple;
const bool isMSVC = triple.isWindowsMSVCEnvironment();
Expand Down Expand Up @@ -145,6 +159,8 @@ FileName runCPreprocessor(FileName csrcfile, Loc loc, OutBuffer &defines) {
args.push_back((llvm::Twine("/FI") + importc_h).str());
// preprocessed output file
args.push_back((llvm::Twine("/Fi") + ipath.toChars()).str());

args.push_back((llvm::Twine("/I") + includePath).str());
} else { // Posix
// merge #define's with output:
// https://gcc.gnu.org/onlinedocs/cpp/Invocation.html#index-dD
Expand All @@ -153,6 +169,9 @@ FileName runCPreprocessor(FileName csrcfile, Loc loc, OutBuffer &defines) {
// need to redefine some macros in importc.h
args.push_back("-Wno-builtin-macro-redefined");

args.push_back("-I");
args.push_back(includePath);

args.push_back("-E"); // run preprocessor only
args.push_back("-include");
args.push_back(importc_h);
Expand Down
Loading