diff options
author | Norbert Preining <norbert@preining.info> | 2022-05-11 03:00:53 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-05-11 03:00:53 +0000 |
commit | f13b318e9141d8f73521ec9e249647ebb38c6510 (patch) | |
tree | 0b1d32f330874caf8b0b27f9df044f5fd66eb1a0 /systems/texlive/tlnet/tlpkg/installer/config.guess | |
parent | 61ac4898d4fd5d2dbed7a7fddf97b3f3745018c4 (diff) |
CTAN sync 202205110300
Diffstat (limited to 'systems/texlive/tlnet/tlpkg/installer/config.guess')
-rwxr-xr-x | systems/texlive/tlnet/tlpkg/installer/config.guess | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/systems/texlive/tlnet/tlpkg/installer/config.guess b/systems/texlive/tlnet/tlpkg/installer/config.guess index 7f76b6228f..160ecf0951 100755 --- a/systems/texlive/tlnet/tlpkg/installer/config.guess +++ b/systems/texlive/tlnet/tlpkg/installer/config.guess @@ -4,7 +4,7 @@ # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2022-01-09' +timestamp='2022-05-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -1151,16 +1151,27 @@ EOF ;; x86_64:Linux:*:*) set_cc_for_build + CPU=$UNAME_MACHINE LIBCABI=$LIBC if test "$CC_FOR_BUILD" != no_compiler_found; then - if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_X32 >/dev/null - then - LIBCABI=${LIBC}x32 - fi + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __i386__ + ABI=x86 + #else + #ifdef __ILP32__ + ABI=x32 + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + x86) CPU=i686 ;; + x32) LIBCABI=${LIBC}x32 ;; + esac fi - GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI + GUESS=$CPU-pc-linux-$LIBCABI ;; xtensa*:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC |