diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-08-28 16:59:35 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-08-28 16:59:35 -0400 |
| commit | 928ce5e326ccd1b7456002c28f34975b5bc4b13f (patch) | |
| tree | 5706376fe74103223511f5a4954ce2dff0b08d0e /src/target.cpp | |
| parent | 2f3ad48c9b35ccac377e710a4eee6b35f60b119f (diff) | |
| parent | e8a9caa3dd0aef7b745b8197afecec90598b2cdd (diff) | |
| download | zig-928ce5e326ccd1b7456002c28f34975b5bc4b13f.tar.gz zig-928ce5e326ccd1b7456002c28f34975b5bc4b13f.zip | |
Merge remote-tracking branch 'origin/master' into llvm9
Diffstat (limited to 'src/target.cpp')
| -rw-r--r-- | src/target.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/target.cpp b/src/target.cpp index 8b533f4af6..ca66107bb7 100644 --- a/src/target.cpp +++ b/src/target.cpp @@ -504,6 +504,16 @@ Error target_parse_glibc_version(ZigGLibCVersion *glibc_ver, const char *text) { return ErrorNone; } +static ZigLLVM_EnvironmentType target_get_win32_abi() { + FILE* files[] = { stdin, stdout, stderr, nullptr }; + for (int i = 0; files[i] != nullptr; i++) { + if (os_is_cygwin_pty(fileno(files[i]))) { + return ZigLLVM_GNU; + } + } + return ZigLLVM_MSVC; +} + void get_native_target(ZigTarget *target) { // first zero initialize *target = {}; @@ -518,6 +528,9 @@ void get_native_target(ZigTarget *target) { &target->abi, &oformat); target->os = get_zig_os_type(os_type); + if (target->os == OsWindows) { + target->abi = target_get_win32_abi(); + } target->is_native = true; if (target->abi == ZigLLVM_UnknownEnvironment) { target->abi = target_default_abi(target->arch, target->os); @@ -1651,7 +1664,7 @@ ZigLLVM_EnvironmentType target_default_abi(ZigLLVM_ArchType arch, Os os) { return ZigLLVM_GNU; case OsUefi: case OsWindows: - return ZigLLVM_MSVC; + return ZigLLVM_MSVC; case OsLinux: case OsWASI: case OsEmscripten: |