diff options
| author | Bernhard Reutner-Fischer <aldot@gcc.gnu.org> | 2012-04-05 09:00:30 +0200 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <aldot@gcc.gnu.org> | 2012-04-05 09:00:30 +0200 |
| commit | c07e30ca3d4016324714a555b964c6628ba200a4 (patch) | |
| tree | b547bcd8d7ec3ac8635e36435c6db7cf4fc6f5df | |
| parent | 913398edd49a3034a483e3a38de37c432579f2a0 (diff) | |
| download | gcc-c07e30ca3d4016324714a555b964c6628ba200a4.zip gcc-c07e30ca3d4016324714a555b964c6628ba200a4.tar.gz gcc-c07e30ca3d4016324714a555b964c6628ba200a4.tar.bz2 | |
PR bootstrap/52840: libstdc++: let debug find sources for compatibility.lo
2012-04-05 Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
PR bootstrap/52840
* src/Makefile.am (build-debug): Do not adjust vpath dir, remove
Makefile.tmp
* src/Makefile.in: Adjust as per above.
From-SVN: r186156
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.am | 3 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.in | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d7d3b4c..5323e2e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2012-04-05 Bernhard Reutner-Fischer <aldot@gcc.gnu.org> + + PR bootstrap/52840 + * src/Makefile.am (build-debug): Do not adjust vpath dir, remove + Makefile.tmp + * src/Makefile.in: Adjust as per above. + 2012-04-04 Uros Bizjak <ubizjak@gmail.com> Partially revert: diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 28430cf..52cf0d5 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -293,8 +293,9 @@ build-debug: stamp-debug mv Makefile Makefile.tmp; \ sed -e 's,all-local: all-once,all-local:,' \ -e 's,install-data-local: install-data-once,install-data-local:,' \ - -e 's,src/c,src/debug/c,' \ + -e '/vpath/!s,src/c,src/debug/c,' \ < Makefile.tmp > Makefile ; \ + rm -f Makefile.tmp ; \ $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \ toolexeclibdir=$(glibcxx_toolexeclibdir)/debug all) ; diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 3c1facf..d211ba9 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -914,8 +914,9 @@ build-debug: stamp-debug mv Makefile Makefile.tmp; \ sed -e 's,all-local: all-once,all-local:,' \ -e 's,install-data-local: install-data-once,install-data-local:,' \ - -e 's,src/c,src/debug/c,' \ + -e '/vpath/!s,src/c,src/debug/c,' \ < Makefile.tmp > Makefile ; \ + rm -f Makefile.tmp ; \ $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \ toolexeclibdir=$(glibcxx_toolexeclibdir)/debug all) ; |