mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-17 23:10:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

avoid duplicated code of specifying the default glibc version

Browse Source
This commit is contained in:
Andrew Kelley 2019-09-27 17:38:37 -04:00
parent dc299166cf
commit 579301c2af
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.cpp
View File

@ -979,8 +979,7 @@ int main(int argc, char **argv) {
return print_error_usage(arg0);
}
} else {
// Default cross-compiling glibc version
*target.glibc_version = {2, 17, 0};
target_init_default_glibc_version(&target);
}
} else if (target_glibc != nullptr) {
fprintf(stderr, "'%s' is not a glibc-compatible target", target_string);

6
src/target.cpp
View File

@ -524,7 +524,7 @@ void get_native_target(ZigTarget *target) {
}
if (target_is_glibc(target)) {
target->glibc_version = allocate<ZigGLibCVersion>(1);
*target->glibc_version = {2, 17, 0};
target_init_default_glibc_version(target);
#ifdef ZIG_OS_LINUX
Error err;
if ((err = glibc_detect_native_version(target->glibc_version))) {
@ -534,6 +534,10 @@ void get_native_target(ZigTarget *target) {
}
}
void target_init_default_glibc_version(ZigTarget *target) {
*target->glibc_version = {2, 17, 0};
}
Error target_parse_archsub(ZigLLVM_ArchType *out_arch, ZigLLVM_SubArchType *out_sub,
const char *archsub_ptr, size_t archsub_len)
{

1
src/target.hpp
View File

@ -114,6 +114,7 @@ Error target_parse_os(Os *os, const char *os_ptr, size_t os_len);
Error target_parse_abi(ZigLLVM_EnvironmentType *abi, const char *abi_ptr, size_t abi_len);
Error target_parse_glibc_version(ZigGLibCVersion *out, const char *text);
void target_init_default_glibc_version(ZigTarget *target);
size_t target_arch_count(void);
ZigLLVM_ArchType target_arch_enum(size_t index);