From 66c92425474133a5c7fea3573e5366e93456da7a Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@google.com>
Date: Wed, 20 Oct 2010 14:39:17 +0000
Subject: [PATCH] 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
---
ChangeLog | 7 +++++++
Makefile.def | 2 +-
Makefile.in | 4 ++--
Makefile.tpl | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3d1dd148eeb9..91aedbd1f5a3 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-18 Laurynas Biveinis <laurynas.biveinis@gmail.com>
* MAINTAINERS (Reviewers): Add myself for gengtype/GTY.
diff --git a/Makefile.def b/Makefile.def
index 29cd1a38dbb6..6223bf3dbf71 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 1d5ef9e1e73c..aaea69df8af8 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 1f0419c430e3..4c55ee2803e4 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)
--
GitLab