From 8d03ad011afc65df43816e253af7728a738cb3f8 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Mon, 20 Sep 2010 19:33:12 +0000 Subject: [PATCH] re PR libstdc++/45711 (Building with "--enable-libstdcxx-debug" fails during install) Fix PR libstdc++/45711. libstdc++-v3/: PR libstdc++/45711 * src/Makefile.am (stamp-debug): Also adjust possibly-relative file names in MKDIR_P, and, for consistency, also top_build_prefix. * src/Makefile.in: Regenerate. From-SVN: r164451 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/src/Makefile.am | 3 +++ libstdc++-v3/src/Makefile.in | 3 +++ 3 files changed, 13 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index bfcc965809c..4e96eab2e31 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2010-09-20 Ralf Wildenhues + + PR libstdc++/45711 + * src/Makefile.am (stamp-debug): Also adjust possibly-relative + file names in MKDIR_P, and, for consistency, also top_build_prefix. + * src/Makefile.in: Regenerate. + 2010-09-19 Ralf Wildenhues * include/ext/throw_allocator.h diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index d5194c3366e..bd748aadb6e 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -421,13 +421,16 @@ endif debugdir = debug # Build a set of debug objects here. +# Take care to fix all possibly-relative paths. stamp-debug: if test ! -d ${debugdir}; then \ mkdir -p ${debugdir}; \ (cd ${debugdir}; \ sed -e 's/top_builddir = \.\./top_builddir = ..\/../' \ + -e 's/top_build_prefix = \.\./top_build_prefix = ..\/../' \ -e 's/srcdir = \.\./srcdir = ..\/../' \ -e 's/glibcxx_basedir = \.\./glibcxx_basedir = ..\/../' \ + -e 's/MKDIR_P = \.\./MKDIR_P = ..\/../' \ -e 's/all-local: build_debug/all-local:/' \ -e 's/install-data-local: install_debug/install-data-local:/' \ < ../Makefile > Makefile) ; \ diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 92390975740..ee1c9935c76 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -946,13 +946,16 @@ future.o: future.cc @GLIBCXX_BUILD_DEBUG_FALSE@install-data-local: # Build a set of debug objects here. +# Take care to fix all possibly-relative paths. stamp-debug: if test ! -d ${debugdir}; then \ mkdir -p ${debugdir}; \ (cd ${debugdir}; \ sed -e 's/top_builddir = \.\./top_builddir = ..\/../' \ + -e 's/top_build_prefix = \.\./top_build_prefix = ..\/../' \ -e 's/srcdir = \.\./srcdir = ..\/../' \ -e 's/glibcxx_basedir = \.\./glibcxx_basedir = ..\/../' \ + -e 's/MKDIR_P = \.\./MKDIR_P = ..\/../' \ -e 's/all-local: build_debug/all-local:/' \ -e 's/install-data-local: install_debug/install-data-local:/' \ < ../Makefile > Makefile) ; \