From 2021754b745eba39ef83ff11d504c0257f0f8c11 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 30 Apr 2021 09:24:31 +0000 Subject: lei sucks: preserve utsname.machine, add "x86" where appropriate It's helpful for us to distinguish x86 kernels from x86_64 kernels when using an x86 userspace. OSes are dropping i386 support and only support i486 and newer, so "x86" is a more appropriate description for that platform than "i386". --- lib/PublicInbox/LeiSucks.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/PublicInbox/LeiSucks.pm b/lib/PublicInbox/LeiSucks.pm index d364a856..2ce64d62 100644 --- a/lib/PublicInbox/LeiSucks.pm +++ b/lib/PublicInbox/LeiSucks.pm @@ -18,7 +18,8 @@ sub lei_sucks { $lei->start_pager if -t $lei->{1}; my ($os, undef, $rel, undef, $mac)= POSIX::uname(); if ($mac eq 'x86_64' && $Config{ptrsize} == 4) { - $mac = $Config{cppsymbols} =~ /\b__ILP32__=1\b/ ? 'x32' : 'i386' + $mac .= $Config{cppsymbols} =~ /\b__ILP32__=1\b/ ? + ',u=x32' : ',u=x86'; } eval { require PublicInbox }; my $pi_ver = eval('$PublicInbox::VERSION') // '(???)'; -- cgit v1.2.3-24-ge0c7