Skip to content

Commit

Permalink
* Makefile.def (target_modules): Set lib_path to src/.libs for
Browse files Browse the repository at this point in the history
	libstdc++-v3 module.
	* Makefile.tpl: Fix typo in TARGET_LIB_PATH comment.
	* Makefile.in: Rebuild.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@165727 138bc75d-0d04-0410-961f-82ee72b054a4
  • Loading branch information
ian committed Oct 20, 2010
1 parent 936983b commit 1235ba9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Makefile.def
Original file line number Diff line number Diff line change
Expand Up @@ -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; };
Expand Down
4 changes: 2 additions & 2 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 1235ba9

Please sign in to comment.