From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CD159158091 for ; Mon, 6 Jun 2022 08:42:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA63BE0871; Mon, 6 Jun 2022 08:42:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C98E2E0871 for ; Mon, 6 Jun 2022 08:42:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8F351341214 for ; Mon, 6 Jun 2022 08:42:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CE09244E for ; Mon, 6 Jun 2022 08:42:13 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1654497708.5d8daa635220d6ac96f5891c8b46fd815f7c8082.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 5d8daa635220d6ac96f5891c8b46fd815f7c8082 X-VCS-Branch: master Date: Mon, 6 Jun 2022 08:42:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3e3515c5-114c-4a39-bfc0-049a83bb9678 X-Archives-Hash: 45808e358607c3d0317cd273b19ff1ae commit: 5d8daa635220d6ac96f5891c8b46fd815f7c8082 Author: Fabian Groffen gentoo org> AuthorDate: Mon Jun 6 06:41:48 2022 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Mon Jun 6 06:41:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5d8daa63 scripts/bootstrap-prefix: try and detect musl libc on Linux Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 3b5d911680..dc78743b93 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -3140,15 +3140,18 @@ if [[ -z ${CHOST} ]]; then if [[ x$(type -t uname) == "xfile" ]]; then case `uname -s` in Linux) + plt="gnu" + [[ -e /lib/ld-musl-*.so.1 ]] && plt="musl" + sfx="unknown-linux-${plt}" case `uname -m` in ppc*) - CHOST="`uname -m | sed -e 's/^ppc/powerpc/'`-unknown-linux-gnu" + CHOST="`uname -m | sed -e 's/^ppc/powerpc/'`-${sfx}" ;; powerpc*|aarch64*) - CHOST="`uname -m`-unknown-linux-gnu" + CHOST="`uname -m`-${sfx}" ;; *) - CHOST="`uname -m`-pc-linux-gnu" + CHOST="`uname -m`-${sfx/unknown/pc}" ;; esac ;;