From nobody Thu Jul 27 18:34:17 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RBfYj3HCnz4pJ1J; Thu, 27 Jul 2023 18:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RBfYj2jlNz4B7c; Thu, 27 Jul 2023 18:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690482857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HwJAizWJjcpWpK+2WQZqZ/dwDtPtiOAocv3AM7IH6Es=; b=gbsEoVcctXqq2c2qxiv37A4tAZYtL0rHPjqL64+qyAbTfCvodGDp8ePSd1nAiZ49JWGwqn CqEuitCWCYbYKBP/10+6KqAU9Cc2u4k48sZKMxhQ6ZsGHazbpYhYtztYAOiqF98DMRTJ4e j6BnjiZnid/fdMdgFzrS4jA4mrptTn81TlfRoqJ5rXSxmvQ1FQre7rptmgekgfV6pLD90y 0fQAuGramVqJOX/QyMKNoiTXHe+tgsJZydH29HS8QBfTyO64wZMbtFs7NUeVcovl7tmBYt wV9BGpnhC4owzVayX/tsQtMVqsPANwwS3y2zbNxu2+dUlAKpQQxt1Q1FjCgBng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690482857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HwJAizWJjcpWpK+2WQZqZ/dwDtPtiOAocv3AM7IH6Es=; b=dgcqs+ohSNBRiMILEghTyIZOLEq4nFBWd5Frb7icslUrsHISQVDlYEW8VWRObP4/sJ7yQw UfBAH5pDG/EVCL2FtjXhqRBAzTpnquHlFailhqBtYa6r7F7kt+9Zn04zlbWow004KIZ8Id IEhRPVIROwURA3EsvwNXRdlly7cTwCHc34NAqtyInbgxCwpRA5z9wpG4O+vTo5dMbvumA8 e9r+tn5kqIj8sLoSVRsS7qPS56mZQ9FW8slTo2INWzrZv661F3QMjdi2GMnzPHwb3EHx5q 3C5W7GtxBRilrxxdpWF91ST0FoVp8MsksFUWMbXkDQYoSOXm4RZne2gSO8QXbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690482857; a=rsa-sha256; cv=none; b=vHayY/YGjGX+fICON1Dt1z3qA0VeMCwX0LuCLfq1n1EqtvucAoW1KKJmgP0fw8CC2vUgec rbFoxTB23mURgByqOjyaMhp/rgnj0R19h8jkhoY+0qxrQkQAEUcMkvCyZkyUo2W17Exs4D 8/7mltvniVy0cikgCuOJxJ1l0dA4ki9GqvoaVHhToOoF8Cd50wxSbcEOaxnKNJxSE2F67I LWf4DW0JadV3qIO79lj6Whg06VPgn63pC4TgxvgiJ8PIVPPiEwp+SieP9A7F2PPSa+9Zuc 1opUmigC8iZ1qyFu1f0TDfzH8pCwCSMj/Thkt/r+Ygkp/49pCrHAMnWrO1tGZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RBfYj1q5czL7X; Thu, 27 Jul 2023 18:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36RIYHpV022087; Thu, 27 Jul 2023 18:34:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36RIYHqW022086; Thu, 27 Jul 2023 18:34:17 GMT (envelope-from git) Date: Thu, 27 Jul 2023 18:34:17 GMT Message-Id: <202307271834.36RIYHqW022086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 3cde8fbf97f1 - stable/13 - Really fix cross-builds from macOS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3cde8fbf97f139b99b38c6774042431b2d3be15a Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3cde8fbf97f139b99b38c6774042431b2d3be15a commit 3cde8fbf97f139b99b38c6774042431b2d3be15a Author: Jessica Clarke AuthorDate: 2022-06-30 21:08:31 +0000 Commit: Ed Maste CommitDate: 2023-07-27 18:33:59 +0000 Really fix cross-builds from macOS LINKER_TYPE is set to mac not macos on macOS. Fixes: 7927452ac4e9 ("Add RELRO build knob, default to enabled") (cherry picked from commit 4ca6ecf100733ecd61f32257452690c56a6b6a3e) --- share/mk/bsd.lib.mk | 2 +- share/mk/bsd.prog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 900bc00f0f03..d16ea6967b23 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -77,7 +77,7 @@ TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} .if ${MK_BIND_NOW} != "no" LDFLAGS+= -Wl,-znow .endif -.if ${LINKER_TYPE} != "macos" +.if ${LINKER_TYPE} != "mac" .if ${MK_RELRO} == "no" LDFLAGS+= -Wl,-znorelro .else diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index d044fed0aeb7..fd44a5b40c8d 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -41,7 +41,7 @@ MK_DEBUG_FILES= no .if ${MK_BIND_NOW} != "no" LDFLAGS+= -Wl,-znow .endif -.if ${LINKER_TYPE} != "macos" +.if ${LINKER_TYPE} != "mac" .if ${MK_RELRO} == "no" LDFLAGS+= -Wl,-znorelro .else