From patchwork Mon Oct 18 20:08:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 68236 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 5BBC6B70F1 for ; Tue, 19 Oct 2010 07:08:37 +1100 (EST) Received: (qmail 32461 invoked by alias); 18 Oct 2010 20:08:32 -0000 Received: (qmail 32452 invoked by uid 22791); 18 Oct 2010 20:08:31 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, SPF_HELO_PASS, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (216.239.44.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 18 Oct 2010 20:08:26 +0000 Received: from kpbe20.cbf.corp.google.com (kpbe20.cbf.corp.google.com [172.25.105.84]) by smtp-out.google.com with ESMTP id o9IK8Nnp014990 for ; Mon, 18 Oct 2010 13:08:24 -0700 Received: from pzk7 (pzk7.prod.google.com [10.243.19.135]) by kpbe20.cbf.corp.google.com with ESMTP id o9IK8584007201 for ; Mon, 18 Oct 2010 13:08:22 -0700 Received: by pzk7 with SMTP id 7so137492pzk.28 for ; Mon, 18 Oct 2010 13:08:22 -0700 (PDT) MIME-Version: 1.0 Received: by 10.143.33.1 with SMTP id l1mr3880087wfj.249.1287432502102; Mon, 18 Oct 2010 13:08:22 -0700 (PDT) Received: by 10.220.180.130 with HTTP; Mon, 18 Oct 2010 13:08:21 -0700 (PDT) In-Reply-To: References: Date: Mon, 18 Oct 2010 13:08:21 -0700 Message-ID: Subject: Re: PATCH RFA: libstdc++ lives in src/.libs From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org X-System-Of-Record: true 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 Ping for build maintainers. Ian On Thu, Oct 7, 2010 at 4:54 PM, Ian Lance Taylor wrote: > In the top level Makefile.def file, the lib_path of a target module > gives the directory where the library can be found at run time.  This is > used to set LD_LIBRARY_PATH (or equivalent) when bootstrapping.  The > value for libstdc++-v3 is .libs, but actually the library is built in > src/.libs.  This patch corrects this error. > > Bootstrapped on x86_64-unknown-linux-gnu.  Passed the libstdc++-v3 and > g++ testsuites. > > OK for mainline? > > Ian > > > 2010-10-07  Ian Lance Taylor   > >        * Makefile.def (target_modules): Set lib_path to src/.libs for >        libstdc++-v3 module. >        * Makefile.tpl: Fix typo in TARGET_LIB_PATH comment. >        * Makefile.in: Rebuild. > > > Index: Makefile.def =================================================================== --- Makefile.def (revision 165058) +++ Makefile.def (working copy) @@ -149,7 +149,7 @@ host_modules= { module= lto-plugin; boot target_modules = { module= libstdc++-v3; bootstrap=true; - lib_path=.libs; + lib_path=src/.libs; raw_cxx=true; }; target_modules = { module= libmudflap; lib_path=.libs; }; target_modules = { module= libssp; lib_path=.libs; }; Index: Makefile.tpl =================================================================== --- Makefile.tpl (revision 165058) +++ Makefile.tpl (working copy) @@ -513,7 +513,7 @@ all: ### # This is the list of directories that may be needed in RPATH_ENVVAR -# so that prorgams built for the target machine work. +# so that programs built for the target machine work. TARGET_LIB_PATH = [+ FOR target_modules +][+ IF lib_path +]$(TARGET_LIB_PATH_[+module+])[+ ENDIF lib_path +][+ ENDFOR target_modules +]$(HOST_LIB_PATH_gcc)