| author |  Andrew Kelley <andrew@ziglang.org> 2020-02-21 20:48:50-05:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2020-02-21 20:48:50-05:00 |
| log | dca19b67573dc46260b318e9253370fbc628834d |
| tree | 4b2d58f8818d22aac2c41ae21639860ef9141ed8 |
| parent | 6305ce828b0685ceb646fae87a963f034d3bcdf0 |
| signature |  Commit is signed but in an unrecognized format. |
fix regression in detecting native glibc version
closes #45192 files changed, 8 insertions(+), 6 deletions(-)
src/main.cpp+8
| ... | ... | @@ -992,6 +992,14 @@ static int main0(int argc, char **argv) { |
| 992 | 992 | } |
| 993 | 993 | } else { |
| 994 | 994 | target_init_default_glibc_version(&target); |
| 995 | #if defined(ZIG_OS_LINUX) | |
| 996 | if (target.is_native) { | |
| 997 | // TODO self-host glibc version detection, and then this logic can go away | |
| 998 | if ((err = glibc_detect_native_version(target.glibc_version))) { | |
| 999 | // Fall back to the default version. | |
| 1000 | } | |
| 1001 | } | |
| 1002 | #endif | |
| 995 | 1003 | } |
| 996 | 1004 | } else if (target_glibc != nullptr) { |
| 997 | 1005 | fprintf(stderr, "'%s' is not a glibc-compatible target", target_string); |
src/target.cpp-6
| ... | ... | @@ -467,12 +467,6 @@ void get_native_target(ZigTarget *target) { |
| 467 | 467 | if (target_is_glibc(target)) { |
| 468 | 468 | target->glibc_version = heap::c_allocator.create<ZigGLibCVersion>(); |
| 469 | 469 | target_init_default_glibc_version(target); |
| 470 | #ifdef ZIG_OS_LINUX | |
| 471 | Error err; | |
| 472 | if ((err = glibc_detect_native_version(target->glibc_version))) { | |
| 473 | // Fall back to the default version. | |
| 474 | } | |
| 475 | #endif | |
| 476 | 470 | } |
| 477 | 471 | } |
| 478 | 472 |