From patchwork Thu Jan 18 15:07:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 84350 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 42B9B3858434 for ; Thu, 18 Jan 2024 15:07:47 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by sourceware.org (Postfix) with ESMTPS id D18D63858C42 for ; Thu, 18 Jan 2024 15:07:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D18D63858C42 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D18D63858C42 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::436 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705590440; cv=none; b=UPbmcfxrYcceL+uaWMDMuS6hM9Ayqip16N8pjfULvqqcb+ISaF53JROP1lpLbN681TirFZfV4OTrGEp+IDdcMCt6sOgpxzW0U1DfT7AS3+3p23nO7HFPke07lpETYUFuVFHyMEP0CjuG++3dBTmU6Krf7Vo5VduQysn7iR4x4bc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705590440; c=relaxed/simple; bh=/Ir+H0iPAly44I+e2WTwe5UJxWvQL02sX0wsI3Yajts=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=XA4QtpO21raOgnBjhDJKDcZ0IDQeiy1bxVz7KWUkVyYgcEOWZeOANCycBhCCdKQq0bjTVNsE6CcvD6Hvj2Pswue50vGs7+Pu0j7yzP6bz+ABbERkeYMWSIYwqyphMXsS19rgnuvXO7cHu9WVzMSxd3ihnxlKtJmvt7gS87FQYHs= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-337b71a0240so2785428f8f.0 for ; Thu, 18 Jan 2024 07:07:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705590429; x=1706195229; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=VL8xEbrBAWE66UgUtuIrmWfsLxHaSqv2IuiIn80T/F0=; b=XcjPWEtbj4m0PZ8cJIGCN9STuoAYfqSW4UuW0WgDmgcqo58c9xaNF2LzjurtL/rFTF v7p3IF9j7+OM4vzOUXCHYdrQSCxbmdllyTdFcXI0/PFrSg6rK335Zbgeekg/RhXx+hgU JDyFd7eUd23JGOm6Lu7AWhVN1bQzpbvl/ne4EmRZHjraSGx1DxScReVhwPfEHPXISpsy hm6/SJBO6ieENo7ugDIjcOH4SXkluDB01RXn0DSeMEKOspmXH+hs5+7YUS9QKnLUmVh7 Apx37cnS6lfh/+s6d+j6O0GWHJxRlU4Ukot8jOeKHn+7vlLkGYGA73xcDlBEgARPf1MQ s53Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705590429; x=1706195229; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=VL8xEbrBAWE66UgUtuIrmWfsLxHaSqv2IuiIn80T/F0=; b=SPXCeFM/5xN3SlHwB1XzzyT0Kccm1Iu3XAsOA9wUcysJB2BEEUqmsoozJWl0Nyw6ya rwkuv3PrxhDMX2VZ3HOn5rc/0iIX5Dbj8eo7g2j1X4EcPeOhIS2CsSSQ58CmENxxzhm0 PnTtFkd3k561nSxwEpL0wmOJRxswOkA2xhhhbrJgs6PZm5T/Jpk1j9NuxRvZ7iMUajWp Q4j98d+EXXImZFkonHGwj3Qc3jPnTS6f95+6ePe2BoqgGh2ATVZX0LiQ9XSnhSMgrDXr qIv/I6BJ1rEE+FIxKsSSOSneAVVH+3b1nfaUgWg7XpyP7xferCPOi09ZYF7QETxSKEjb /jMA== X-Gm-Message-State: AOJu0YwcuHHsBCx0vFNQoxurYAXyRVSER+YIzSazoJxZpxc2ct8B6Ldn 762m2B3LFd2oO/ruJ3mTjzC7sNHfozXWxzqVcKCblptPTT5VwLvMx0K4/5Wm X-Google-Smtp-Source: AGHT+IF5ivqZneIuDB5k3SihVof/RtD/NgZ7/F4pot6+xa7iYa9rzjlP0c0R3oy2aT3Usyb2V1EuvA== X-Received: by 2002:adf:f846:0:b0:337:4e5e:5b55 with SMTP id d6-20020adff846000000b003374e5e5b55mr694476wrq.45.1705590429113; Thu, 18 Jan 2024 07:07:09 -0800 (PST) Received: from localhost.localdomain (host81-138-1-83.in-addr.btopenworld.com. [81.138.1.83]) by smtp.gmail.com with ESMTPSA id i6-20020adfb646000000b00337bc2176f6sm4245122wre.81.2024.01.18.07.07.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 18 Jan 2024 07:07:08 -0800 (PST) From: Iain Sandoe X-Google-Original-From: Iain Sandoe To: gcc-patches@gcc.gnu.org Subject: [pushed] Darwin, configure: Handle a missing substitution. Date: Thu, 18 Jan 2024 15:07:08 +0000 Message-Id: <20240118150708.25205-1-iain@sandoe.co.uk> X-Mailer: git-send-email 2.39.2 (Apple Git-143) MIME-Version: 1.0 X-Spam-Status: No, score=-8.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: iain@sandoe.co.uk Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Tested on x86_64 Darwin21 (has default rpath) and i686 darwin9 and x86_64 Linux (no @rpath), pushed to trunk, thanks, Iain --- 8< --- The configure substitution for enable_darwin_at_rpath has been omitted, which leads to a failure to set ENABLE_DARWIN_AT_RPATH in the testsuite site.exp (which leads to failure to add -B options in some cases, breaking uninstalled testing there). Since we already have substitutions for ENABLE_DARWIN_AT_RPATH_TRUE we can use that instead, which is what this patch does. gcc/ChangeLog: * Makefile.in: Emit ENABLE_DARWIN_AT_RPATH into site.exp when ENABLE_DARWIN_AT_RPATH_TRUE is not '#'. Signed-off-by: Iain Sandoe --- gcc/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in index deb12e17d25..95caa54a52b 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -4303,7 +4303,7 @@ site.exp: ./config.status Makefile echo "set COMPAT_OPTIONS \"$(COMPAT_OPTIONS)\"" >> ./site.tmp; \ else true; \ fi - @if test "x@enable_darwin_at_rpath@" = "xyes" ; then \ + @if test "X@ENABLE_DARWIN_AT_RPATH_TRUE@" != "X#" ; then \ echo "set ENABLE_DARWIN_AT_RPATH 1" >> ./site.tmp; \ fi @echo "## All variables above are generated by configure. Do Not Edit ##" >> ./site.tmp