From patchwork Wed Aug 8 15:49:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Baldwin X-Patchwork-Id: 175942 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id D942C2C0086 for ; Thu, 9 Aug 2012 01:49:20 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1345045761; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:Received:Received:To:Subject:Message-Id:Date: From:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=R2EXftG /yCJeDWbXOe77lcHJ3MY=; b=S6S8sh7UY1Cjr165DNaZL15Nk/jlG+4BdNX6pV1 nWnYIiiYj98A0h7qzTq+1M4AYHmcbOdO1VJVz2HSF4bu6TjfNOPPza5KN4/IVwhs roF1D9ve/JpF+aZARp/juKvxeC3xW9gKk93Mwabfd6KR20JgGYxGBhnala4KmudR w0Fs= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:X-Google-DKIM-Signature:Received:Received:Received:Received:Received:To:Subject:Message-Id:Date:From:X-Gm-Message-State:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=UuuQCM23uQtuzHKn0sJ27zPqwxWKiZ6JJSGiBJFKL9iOGYsaaGwbm/Rs/Cy8No TUBVNCUZRNOCWV1+IiP3Kza7a95GGBFr1I1js6GMLcCrw9E3RmwUWeglit3f1H0r FqGBIEUEBfGngMPOcbs03L6W5dXJ37NnMW8qhoKRUrxco=; Received: (qmail 4570 invoked by alias); 8 Aug 2012 15:49:16 -0000 Received: (qmail 4562 invoked by uid 22791); 8 Aug 2012 15:49:15 -0000 X-SWARE-Spam-Status: No, hits=-4.0 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, T_RP_MATCHES_RCVD, URIBL_DBL_REDIR X-Spam-Check-By: sourceware.org Received: from mail-fa0-f73.google.com (HELO mail-fa0-f73.google.com) (209.85.161.73) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 08 Aug 2012 15:49:02 +0000 Received: by favv9 with SMTP id v9so43850fav.2 for ; Wed, 08 Aug 2012 08:49:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=to:subject:message-id:date:from:x-gm-message-state; bh=IteRxk4ltXvMIo1AoO2tvM0AY1Va0toLIMM3RbiTwho=; b=RKENn/VHTE1i4JYL3dQGIA5tCCWwb2h+VKtCtmZADmYYzdYJgS5DZPlbiTjLmjfXzI j3imsm+cgO7/1JbG5aXheu0MJkUc5BVz+xArf31LxxlMfT1pmPjB8nBTazyiH0H3Jppe zftPEVZFODTebpNCG5rv4qMOwnlr910+TKs3jIwdysAI3FzgLQRVcou5iZc/tpJV0P2K bKP+cuuOKDXCcO9gm/Tt0DxQmjPepXy/whrAGzodRtmJm/HbieSmtMcaCnHNYSpGjvsh 4/6oyh/Cakg/wBelzVUb3Fs88NLqcF55Dd2rjJkSP0GiTIIzUcDGnXOCH+EzSsYzVspJ eBtw== Received: by 10.14.182.7 with SMTP id n7mr8601251eem.6.1344440941233; Wed, 08 Aug 2012 08:49:01 -0700 (PDT) Received: by 10.14.182.7 with SMTP id n7mr8601245eem.6.1344440941179; Wed, 08 Aug 2012 08:49:01 -0700 (PDT) Received: from hpza9.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id 46si32324774eed.1.2012.08.08.08.49.01 (version=TLSv1/SSLv3 cipher=AES128-SHA); Wed, 08 Aug 2012 08:49:01 -0700 (PDT) Received: from xoom.chi.corp.google.com (xoom.chi.corp.google.com [172.31.47.91]) by hpza9.eem.corp.google.com (Postfix) with ESMTP id 0E0A05C0050; Wed, 8 Aug 2012 08:49:01 -0700 (PDT) Received: by xoom.chi.corp.google.com (Postfix, from userid 9603) id 77070A16EF; Wed, 8 Aug 2012 10:49:00 -0500 (CDT) To: reply@codereview.appspotmail.com,gcc-patches@gcc.gnu.org Subject: [google] Omit another TARGET_LIB_PATH from RPATH_ENVVAR set on bootstrap builds (issue6446102) Message-Id: <20120808154900.77070A16EF@xoom.chi.corp.google.com> Date: Wed, 8 Aug 2012 10:49:00 -0500 (CDT) From: simonb@google.com (Simon Baldwin) X-Gm-Message-State: ALoCoQk9DmMTLme5D5zXhyej5qgUSC/9je90gal9YinBOA+eQ/nBmdpS2pfU3FAszOivn+GLGgFr+D6FNcrhveY88+tvpCgskg46PuUS1vZzRNtKBX0AChpxnhGoeV7MPrtuqzMUXAKV8M0mFaUX/AJVO38M7YuPstKwgW5O8jKzEGUlKpkxgRCi8SEcde2ZyJvlQ3g7kgDm X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Omit another TARGET_LIB_PATH from RPATH_ENVVAR set on bootstrap builds. A second occurrence of adding TARGET_LIB_PATH to LD_LIBRARY_PATH on gcc bootstrap builds. This one also needs removing to enable full test coverage. Discussion and rationale at: http://gcc.gnu.org/ml/gcc/2012-06/msg00314.html For google/main, google/gcc-4_7 and google/gcc-4_7-integration. Tested for bootstrap and regression. 2012-08-08 Simon Baldwin * Makefile.tpl: Omit another TARGET_LIB_PATH from RPATH_ENVVAR set on bootstrap builds. * Makefile.in: Regenerate. --- This patch is available for review at http://codereview.appspot.com/6446102 Index: Makefile.in =================================================================== --- Makefile.in (revision 190231) +++ Makefile.in (working copy) @@ -288,9 +288,6 @@ BASE_TARGET_EXPORTS = \ STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \ WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \ -@if gcc-bootstrap - $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ -@endif gcc-bootstrap $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ TARGET_CONFIGDIRS="$(TARGET_CONFIGDIRS)"; export TARGET_CONFIGDIRS; Index: Makefile.tpl =================================================================== --- Makefile.tpl (revision 190231) +++ Makefile.tpl (working copy) @@ -291,9 +291,6 @@ BASE_TARGET_EXPORTS = \ STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \ WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \ -@if gcc-bootstrap - $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ -@endif gcc-bootstrap $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ TARGET_CONFIGDIRS="$(TARGET_CONFIGDIRS)"; export TARGET_CONFIGDIRS;