From nobody Thu Jun 30 21:10:16 2022 X-Original-To: dev-commits-src-main@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 92E148AFC66; Thu, 30 Jun 2022 21:10:16 +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 4LYrZc3g1jz3DTs; Thu, 30 Jun 2022 21:10:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656623416; 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=u5+LTlCTEBW0kRkwP8o4d354yANKDu2ubrkT4aXA7xQ=; b=jyDpnhqwk6BhmyEKys9mudgdicB5NCa89nXrlZ0wGCii6KV7vK1k6mWo2EFRE09gwhrhaf vwZ0TLmXuSqBXeIHiW31xav0kqwBpOUhWUYu/PVgJAsmIIjZzupfhLmfZiC7cAh18rmlPy X7kobqDOMiOSm8ctz2vFldg58+BhdNo/aEi5QYngWPXX6lo1RZEIZC4DTlpMuVvVsW6Vuk 74Yg2JHhY9S47LIGrFnX5MOHLeeWnVhH73RZaOuTZAq+YhisBj6EZ2aj29JHOVddXV4fbB qWirEhYJPnOZDeUNigMQoOs6NdMIFcp5MR+vkyXoWehc1+B0DlmGBJDp6ikKIA== 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 5D65B6297; Thu, 30 Jun 2022 21:10:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25ULAGAL015454; Thu, 30 Jun 2022 21:10:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25ULAGD1015447; Thu, 30 Jun 2022 21:10:16 GMT (envelope-from git) Date: Thu, 30 Jun 2022 21:10:16 GMT Message-Id: <202206302110.25ULAGD1015447@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 4ca6ecf10073 - main - Really fix cross-builds from macOS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ca6ecf100733ecd61f32257452690c56a6b6a3e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656623416; 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=u5+LTlCTEBW0kRkwP8o4d354yANKDu2ubrkT4aXA7xQ=; b=xIW/oLvlhDte1E8zKYXhryN0yR9Mm2jI5tku2s3BKlizi8/d0m4j2VPCzIzr1lHt6rSc7q 6OcD0HmhbLixKveZJx09Rtruh3BkAHUJNMCTmUoHKtz6z9cqCO4NHUU1pUShvfHJAQT9I4 OCWtObIpzzohKW7ago9/K2moOjJXf96u31zt+be5YoSfVRkiYR1GwJZIks+cbkVqKEwU9R mjexq5TZz1FnuXuu8F65upQuaiRyCTML6zNRny6VVPUUPrrEYOwuD4sIanlGrw909oxMy0 NuGJJ5Moee2yVvXFD2bGzcWIZ+p4Ipw9mUEWFW058RMObsA+fqzg7kl+orTT6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656623416; a=rsa-sha256; cv=none; b=AxeXcPbr0exB5PXzG95NrlIRZnGQ6DlfqIUeu11GRuZneraMHj47cXZJ1fRXHu1gE1LFmk tWWWoBovoNkE30xVssvZ2n5Br1lRSd3KQ0cnZPqfB44pxMADknT5mt7FsPodIS2/7AwBWF NeMI6LcBcJK84U+Hqr2rlHYiUkOYdNfGDZ9p1UA6DL4vI+PdLrx4dndz+tNioAfIRhM+LS w74jZ8WJw8twODgGet/ULQ+WvIqhknTMl2/CQPfHH/bvsBnF0RrdMnsupSj3ocx8IPbQuf xJgDHFGKZqy0vXhU98+cOvVomwl7MHO2Wyem1/PpMzFqr4ZxPIqZvpHdx3TVeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=4ca6ecf100733ecd61f32257452690c56a6b6a3e commit 4ca6ecf100733ecd61f32257452690c56a6b6a3e Author: Jessica Clarke AuthorDate: 2022-06-30 21:08:31 +0000 Commit: Jessica Clarke CommitDate: 2022-06-30 21:08:31 +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") --- 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 8fa23f6da9bf..5e58e1d010ab 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -79,7 +79,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 c53ecd8a4dc2..de453564579d 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