From nobody Fri Apr 14 23:57:19 2023 X-Original-To: dev-commits-src-all@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 4PytfS0cFrz4559M; Fri, 14 Apr 2023 23:57:20 +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 4PytfR6jrlz3DkV; Fri, 14 Apr 2023 23:57:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681516640; 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=Xx/DKMgpRLYRxguCyi5IXSqUOFOGiE1AxIBErc114kI=; b=rQmNU2HG2bgXgoKuQD8FDtaKbOdLYzUDVKMz8h9zEWS1FsDuByItu0bk2cRNCF554BEuP7 /1eRHZwP0WdAQHLacnfVRqMDbWBTl0S0o6v4kDul7jBDK4A/DzKC6RUFj2wk0wpxdnLox4 IzYtTZ/HE/6MjQlEuJwzDDzmZ7/wgKsAn1E7nZP2vKuqv5nhpylJiAeIBMjTe0rLb4YRug 6IythrEtNxaoyXnamcESaZvY2O2WDzFRki4EsEfJMO+E8iEakpNVkmWhA6YA9bHjrsW3jJ 6s8NQVcSPn3AbLWJAYHMhTXQ6Ew4YsTF87CIwiufXrsubftRG6LBM/9PnEMjKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681516640; 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=Xx/DKMgpRLYRxguCyi5IXSqUOFOGiE1AxIBErc114kI=; b=uC9f11T3leQddRvrRj8I2MslwLjz/k9X/3BiaAV2rKsLDlD032CG/P7iqViVnpDjTmYo8B Qs/rGHcDVNR+nl5L7YCbOLQm6/R+jcPmkKB5FnNLYLHK4pS8mj8rLRvwoxLJVMQDmzaxqb AZd02xEWDziRfWNwEx1eTWx9RdAFFSwMxza8trNtcy10OJBjpiwVygCNpciEujmL+s6lX5 lKhvo+nI13Dl9Q9a5Ab7RbApAyLHmDMfS+35JlAk8XFGRuNLyXZDX6YTB57HeAwV0ZjGNp Pt4nBhpcnL3zVxojlGI1N+LgHpd5T3dLhD6hAvNZ+yD4I+S6ZUdbfSOcRFRr6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681516640; a=rsa-sha256; cv=none; b=N9GJiHsmvMxhqKMGPrcPs04EX9NwoJwvr6ifi3Mc4HvlmIrI6kk5CU7l5lGBrPsYTbVgrR VzOD/9zW6tgdtIjZ7ZBQodJmf9kSCSluwM/2RYeWzTpbOZV75uX7rvESOD/dfy/CH7/jJ+ l69BbcrwTIBNZqe2AlCKVAChKziDMpCf11wpUGiEQAHyzU4UamUX1M/iXgt+WWEP7ilB8G S110MvHyylwwoMfPt6fF+j7rJfftFJv6ymatwci66JTq/Z3SJ0vaZd/qZpq9Hd6reD5CEm iW3ErKNpV5CSMPuavc4TKnBvFEw8hXj/sAt0d6Vwb3d2t+SPIA7dr4rjRDsQjw== 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 4PytfR5qzKzl1n; Fri, 14 Apr 2023 23:57:19 +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 33ENvJYR062814; Fri, 14 Apr 2023 23:57:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ENvJ5k062813; Fri, 14 Apr 2023 23:57:19 GMT (envelope-from git) Date: Fri, 14 Apr 2023 23:57:19 GMT Message-Id: <202304142357.33ENvJ5k062813@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 2b8331622f0b - main - Fix DIRDEPS_BUILD for libgcc_eh List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b8331622f0b212cf3bb4fc4914a501e5321d506 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=2b8331622f0b212cf3bb4fc4914a501e5321d506 commit 2b8331622f0b212cf3bb4fc4914a501e5321d506 Author: Simon J. Gerraty AuthorDate: 2023-04-14 23:56:30 +0000 Commit: Simon J. Gerraty CommitDate: 2023-04-14 23:56:30 +0000 Fix DIRDEPS_BUILD for libgcc_eh --- lib/libbearssl/Makefile.depend | 1 - lib/libgcc_eh/Makefile.inc | 6 ++++++ lib/libssp_nonshared/Makefile.depend | 12 ++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/libbearssl/Makefile.depend b/lib/libbearssl/Makefile.depend index 6cfaab1c3644..8d409f5263ac 100644 --- a/lib/libbearssl/Makefile.depend +++ b/lib/libbearssl/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ diff --git a/lib/libgcc_eh/Makefile.inc b/lib/libgcc_eh/Makefile.inc index 08e5db419840..c48b15412c42 100644 --- a/lib/libgcc_eh/Makefile.inc +++ b/lib/libgcc_eh/Makefile.inc @@ -43,4 +43,10 @@ STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC .if ${MK_DIRDEPS_BUILD} == "yes" # Avoid dependency on lib/libc++ CFLAGS+= -isystem ${SRCTOP}/contrib/llvm-project/libcxx/include -nostdinc++ + +# we need this for __config_site +CFLAGS+= -I${SRCTOP}/lib/libc++ +.if ${.MAKE.LEVEL} > 0 +GENDIRDEPS_FILTER+= Nlib/libc++ +.endif .endif diff --git a/lib/libssp_nonshared/Makefile.depend b/lib/libssp_nonshared/Makefile.depend new file mode 100644 index 000000000000..79506ce16b79 --- /dev/null +++ b/lib/libssp_nonshared/Makefile.depend @@ -0,0 +1,12 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif