aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.def2
-rw-r--r--Makefile.in4
-rw-r--r--Makefile.tpl2
4 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5fb7b61..54fb1bd 100644
--- 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-08 Bernd Schmidt <bernds@codesourcery.com>
Joseph Myers <joseph@codesourcery.com>
diff --git a/Makefile.def b/Makefile.def
index 29cd1a3..6223bf3 100644
--- 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 1d5ef9e..aaea69d 100644
--- 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 1f0419c..4c55ee2 100644
--- 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)