From patchwork Wed Nov 17 21:03:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 47853 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 3BE4D3858409 for ; Wed, 17 Nov 2021 21:05:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3BE4D3858409 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1637183150; bh=ZuXUqLm9cBWMsKDwfoUyTb5k0YmmPvc3C7b6H7ojZaw=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=kIybGxNQ2pbjFm2C2R5Ymc6o0ANeVziztjG8LB7PjIVz/mVeRGBs05XygE5PaYoHl m0Xox2zPsxfUS5Z1lpITBzAjt4N8yST2DacZUlaf+QMaexNvgAH7jN4eUKZ0kSNpJf eUEeDlUxAL8I/or/2cbIGPe5Yjn7u1+owtNZ4nPM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by sourceware.org (Postfix) with ESMTPS id B9C9D3858414 for ; Wed, 17 Nov 2021 21:03:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B9C9D3858414 Received: by mail-wm1-x32f.google.com with SMTP id p18so3405626wmq.5 for ; Wed, 17 Nov 2021 13:03:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=ZuXUqLm9cBWMsKDwfoUyTb5k0YmmPvc3C7b6H7ojZaw=; b=aVP8A3XWrEGmfy0DTsz/5sLnmihNsk8xEOZwPj2NaootK+Dw/s4Pf/974JY6xEpThw K92jsoqKBnz0t7eXmlTv4wzwccS5BfJwr5Feo+6tMY1owqpo4S3DZA9ySxRhR0WtBD+4 ehClwCmz/OlYYhdkYSdin22QMXPE0x5KW5tWvExpYjdG6c3104o2StmnWgSR3IFsgn8N doTkHaxn+KiHr+73R64uNj7N+vCM4HEg6wN5QeZfzexfl9cN/uABvGGKocqeGPEQrG+h fAfiH4HiDO8uNQRFjYKre6Sz+I5Z+0wPNyNnbLs7Dv+B041qtv+ZP/Qzt737oigAwPNf lnNQ== X-Gm-Message-State: AOAM531uUJOLg8TH0D/7/wlFOzdnhsUwfg/f0uVDKnz9Ik1B/8oOqmJd bE3HBeP0V4X9XwID4bPgh6ENqp6t8KM= X-Google-Smtp-Source: ABdhPJzVV7rx+CfgQdgM9aHZ/s3nTodg0cfw9B0glMlt6Lse4R155o7fvRu+1UOaA6sIqCOHOLp/rw== X-Received: by 2002:a7b:c744:: with SMTP id w4mr3420854wmk.50.1637183007931; Wed, 17 Nov 2021 13:03:27 -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 m17sm945118wrz.22.2021.11.17.13.03.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Nov 2021 13:03:27 -0800 (PST) X-Google-Original-From: Iain Sandoe To: gcc-patches@gcc.gnu.org Subject: [PATCH 4/4] Darwin, Ada : Add loader path as a default rpath. Date: Wed, 17 Nov 2021 21:03:19 +0000 Message-Id: <20211117210319.92514-5-iain@sandoe.co.uk> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20211117210319.92514-4-iain@sandoe.co.uk> References: <20211117210319.92514-1-iain@sandoe.co.uk> <20211117210319.92514-2-iain@sandoe.co.uk> <20211117210319.92514-3-iain@sandoe.co.uk> <20211117210319.92514-4-iain@sandoe.co.uk> 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 autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Iain Sandoe via Gcc-patches From: Iain Sandoe Reply-To: iain@sandoe.co.uk Cc: Iain Sandoe , joseph@codesourcery.com Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Allow the Ada runtimes to find GCC runtimes relative to their non- standard install positions. gcc/ada/ * gcc-interface/Makefile.in: Add @loader_path runpaths to the libgnat and libgnarl shared library builds. --- gcc/ada/gcc-interface/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index 53d0739470a..bffe9de4c89 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -788,6 +788,7 @@ gnatlib-shared-darwin: $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \ $(SO_OPTS) \ -Wl,-install_name,@rpath/libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ + -Wl,-rpath,@loader_path \ $(MISCLIB) cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \ | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -dynamiclib $(PICFLAG_FOR_TARGET) \ @@ -795,6 +796,7 @@ gnatlib-shared-darwin: $(GNATRTL_TASKING_OBJS) \ $(SO_OPTS) \ -Wl,-install_name,@rpath/libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \ + -Wl,-rpath,@loader_path \ $(THREADSLIB) -Wl,libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ libgnat$(soext)