Makefile.def (target_modules): Set lib_path to src/.libs for libstdc++-v3 module.

	* 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.

From-SVN: r165727

diff --git a/ChangeLog b/ChangeLog
index 3d1dd148eeb9bb301e16a9acb557d7ada004f912..91aedbd1f5a34bf1ac840db8716e1cc009d02ed2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-20  Ian Lance Taylor  <iant@google.com>
+
+       * 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.
+
 2010-10-18  Laurynas Biveinis  <laurynas.biveinis@gmail.com>
 
        * MAINTAINERS (Reviewers): Add myself for gengtype/GTY.

diff --git a/Makefile.def b/Makefile.def
index 29cd1a38dbb6e705254ecdbf48f19908acfabd4d..6223bf3dbf71df844f75c7a4147c8aa5cb6fdb53 100644 (file)
--- a/Makefile.def
+++ b/Makefile.def
@@ -149,7 +149,7 @@ host_modules= { module= lto-plugin; bootstrap=true; };
 
 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; };

diff --git a/Makefile.in b/Makefile.in
index 1d5ef9e1e73cd56b7345dfbe29a661dbb7c1f70a..aaea69df8af8cfe82ba9ee7c5392656943ec966b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -560,11 +560,11 @@ 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 = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libmudflap)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(HOST_LIB_PATH_gcc)
 
 @if target-libstdc++-v3
-TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/.libs:
+TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:
 @endif target-libstdc++-v3
 
 @if target-libmudflap

diff --git a/Makefile.tpl b/Makefile.tpl
index 1f0419c430e3617b1c87bc9f3eef2029dcb753bc..4c55ee2803e4256cd2e3d6019e1ef598b47e21b5 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -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)