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 309AF15800F for ; Wed, 22 Feb 2023 19:35:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4DC70E0207; Wed, 22 Feb 2023 19:35:01 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 31A45E0207 for ; Wed, 22 Feb 2023 19:35:01 +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 1ADCB340834 for ; Wed, 22 Feb 2023 19:35:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5DD9C8B6 for ; Wed, 22 Feb 2023 19:34:58 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1677094171.d9d631a188bd27b62082fd93a7f434b00e458b1b.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/openssl/files/gentoo.config-1.0.4 X-VCS-Directories: dev-libs/openssl/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: d9d631a188bd27b62082fd93a7f434b00e458b1b X-VCS-Branch: master Date: Wed, 22 Feb 2023 19:34:58 +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: 3d9e5a0b-add3-4e14-bf0a-f517002d9c0e X-Archives-Hash: 4dbb7f2bd1b2a07ff2404834f638bc0f commit: d9d631a188bd27b62082fd93a7f434b00e458b1b Author: Nicholas Vinson gmail com> AuthorDate: Wed Feb 22 00:57:55 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Wed Feb 22 19:29:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9d631a1 dev-libs/openssl: gentoo.config-1.0.4 clang fix Update gentoo.config-1.0.4 to better support clang compiler toolchains Closes: https://bugs.gentoo.org/885901 Signed-off-by: Nicholas Vinson gmail.com> Closes: https://github.com/gentoo/gentoo/pull/29711 Signed-off-by: Mike Gilbert gentoo.org> dev-libs/openssl/files/gentoo.config-1.0.4 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dev-libs/openssl/files/gentoo.config-1.0.4 b/dev-libs/openssl/files/gentoo.config-1.0.4 index 573a97de3543..79f6331f090c 100644 --- a/dev-libs/openssl/files/gentoo.config-1.0.4 +++ b/dev-libs/openssl/files/gentoo.config-1.0.4 @@ -77,7 +77,9 @@ fi # Detect target arch machine="" +submachine="" chost_machine=${CHOST%%-*} +[[ ${CC} == *clang* ]] && submachine="-clang" case ${system} in linux) case ${chost_machine}:${ABI} in @@ -95,7 +97,7 @@ linux) # hppa64*) machine=parisc64;; hppa*) machine="generic32 -DB_ENDIAN";; i[0-9]86*|\ - x86_64*:x86) machine=x86;; + x86_64*:x86) machine=x86${submachine};; ia64*) machine=ia64;; loongarch64*) machine="loongarch64 -DL_ENDIAN" system=linux64;; m68*) machine="latomic -DB_ENDIAN";; @@ -125,7 +127,7 @@ linux) s390x*) machine=s390x system=linux64;; s390*) machine="generic32 -DB_ENDIAN";; x86_64*:x32) machine=x32;; - x86_64*) machine=x86_64;; + x86_64*) machine=x86_64${submachine};; esac ;; BSD)