gitback/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zig cc: work around clang calling GetCommandLine on Windows

Browse Source
This commit is contained in:
Andrew Kelley 2019-02-24 15:30:30 -05:00
parent bcca76b3c4
commit 8c2c6368f9
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.cpp
View File

@ -260,13 +260,9 @@ int main(int argc, char **argv) {
return 0;
}
if (argc >= 2 && (strcmp(argv[1], "cc") == 0)) {
return ZigClang_main(argc - 1, argv + 1);
}
if (argc >= 2 && strcmp(argv[1], "-cc1") == 0) {
return ZigClang_main(argc, argv);
}
if (argc >= 2 && strcmp(argv[1], "-cc1as") == 0) {
if (argc >= 2 && (strcmp(argv[1], "cc") == 0 ||
strcmp(argv[1], "-cc1") == 0 || strcmp(argv[1], "-cc1as") == 0))
{
return ZigClang_main(argc, argv);
}

3
src/zig_clang_driver.cpp
View File

@ -318,7 +318,8 @@ static int ExecuteCC1Tool(ArrayRef<const char *> argv, StringRef Tool) {
extern "C" int ZigClang_main(int argc_, const char **argv_);
int ZigClang_main(int argc_, const char **argv_) {
llvm::InitLLVM X(argc_, argv_);
SmallVector<const char *, 256> argv(argv_, argv_ + argc_);
size_t argv_offset = (strcmp(argv_[1], "-cc1") == 0 || strcmp(argv_[1], "-cc1as") == 0) ? 0 : 1;
SmallVector<const char *, 256> argv(argv_ + argv_offset, argv_ + argc_);
if (llvm::sys::Process::FixupStandardFileDescriptors())
return 1;