From patchwork Thu Oct 7 23:54:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 67119 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 0519EB70AF for ; Fri, 8 Oct 2010 10:54:51 +1100 (EST) Received: (qmail 16375 invoked by alias); 7 Oct 2010 23:54:49 -0000 Received: (qmail 16367 invoked by uid 22791); 7 Oct 2010 23:54:48 -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, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (74.125.121.35) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 07 Oct 2010 23:54:42 +0000 Received: from wpaz17.hot.corp.google.com (wpaz17.hot.corp.google.com [172.24.198.81]) by smtp-out.google.com with ESMTP id o97NsdxK020191 for ; Thu, 7 Oct 2010 16:54:39 -0700 Received: from pwj10 (pwj10.prod.google.com [10.241.219.74]) by wpaz17.hot.corp.google.com with ESMTP id o97NsbDI004552 for ; Thu, 7 Oct 2010 16:54:38 -0700 Received: by pwj10 with SMTP id 10so114647pwj.32 for ; Thu, 07 Oct 2010 16:54:37 -0700 (PDT) Received: by 10.142.174.15 with SMTP id w15mr1283038wfe.255.1286495673371; Thu, 07 Oct 2010 16:54:33 -0700 (PDT) Received: from coign.google.com ([216.239.45.130]) by mx.google.com with ESMTPS id x8sm2900437wff.23.2010.10.07.16.54.31 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 07 Oct 2010 16:54:32 -0700 (PDT) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org Subject: PATCH RFA: libstdc++ lives in src/.libs Date: Thu, 07 Oct 2010 16:54:29 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 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 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)