diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-09-08 06:35:52 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-09-08 06:35:52 +0000 |
| commit | 6d596fb0a8920c521f2f577dc8f1bf3e60631536 (patch) | |
| tree | 58b22815fd26d22b0e38126df6cfa44b4ca22746 /libstdc++-v3 | |
| parent | 1cfa9bdd34abefa771dc8544c8d7d357c40effec (diff) | |
| download | gcc-6d596fb0a8920c521f2f577dc8f1bf3e60631536.tar.gz | |
2009-09-08 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 151496
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@151497 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 35 | ||||
| -rw-r--r-- | libstdc++-v3/configure.ac | 5 |
3 files changed, 40 insertions, 8 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index acc7355ac05..bfd0e999bc0 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2009-09-07 H.J. Lu <hongjiu.lu@intel.com> + Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + PR libstdc++/41280 + * configure.ac: Run "${multi_basedir}/config-ml.in" to generate + MULTISUBDIR = in subdirectory Makefiles, with ml_norecursion set. + * configure: Regenerate. + 2009-09-06 Paolo Carlini <paolo.carlini@oracle.com> PR libstdc++/41267 diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 2d0c97782cf..122b46a4307 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -61956,57 +61956,78 @@ fi s!`test -f '$<' || echo '$(srcdir)/'`!! _EOF sed -f vpsed$$ $ac_file > tmp$$ - grep '^MULTISUBDIR =' Makefile >> tmp$$ mv tmp$$ $ac_file rm vpsed$$ + echo 'MULTISUBDIR =' >> $ac_file + ml_norecursion=yes + . ${multi_basedir}/config-ml.in + { ml_norecursion=; unset ml_norecursion;} ;; "libsupc++/Makefile":F) cat > vpsed$$ << \_EOF s!`test -f '$<' || echo '$(srcdir)/'`!! _EOF sed -f vpsed$$ $ac_file > tmp$$ - grep '^MULTISUBDIR =' Makefile >> tmp$$ mv tmp$$ $ac_file rm vpsed$$ + echo 'MULTISUBDIR =' >> $ac_file + ml_norecursion=yes + . ${multi_basedir}/config-ml.in + { ml_norecursion=; unset ml_norecursion;} ;; "python/Makefile":F) cat > vpsed$$ << \_EOF s!`test -f '$<' || echo '$(srcdir)/'`!! _EOF sed -f vpsed$$ $ac_file > tmp$$ - grep '^MULTISUBDIR =' Makefile >> tmp$$ mv tmp$$ $ac_file rm vpsed$$ + echo 'MULTISUBDIR =' >> $ac_file + ml_norecursion=yes + . ${multi_basedir}/config-ml.in + { ml_norecursion=; unset ml_norecursion;} ;; "src/Makefile":F) cat > vpsed$$ << \_EOF s!`test -f '$<' || echo '$(srcdir)/'`!! _EOF sed -f vpsed$$ $ac_file > tmp$$ - grep '^MULTISUBDIR =' Makefile >> tmp$$ mv tmp$$ $ac_file rm vpsed$$ + echo 'MULTISUBDIR =' >> $ac_file + ml_norecursion=yes + . ${multi_basedir}/config-ml.in + { ml_norecursion=; unset ml_norecursion;} ;; "doc/Makefile":F) cat > vpsed$$ << \_EOF s!`test -f '$<' || echo '$(srcdir)/'`!! _EOF sed -f vpsed$$ $ac_file > tmp$$ - grep '^MULTISUBDIR =' Makefile >> tmp$$ mv tmp$$ $ac_file rm vpsed$$ + echo 'MULTISUBDIR =' >> $ac_file + ml_norecursion=yes + . ${multi_basedir}/config-ml.in + { ml_norecursion=; unset ml_norecursion;} ;; "po/Makefile":F) cat > vpsed$$ << \_EOF s!`test -f '$<' || echo '$(srcdir)/'`!! _EOF sed -f vpsed$$ $ac_file > tmp$$ - grep '^MULTISUBDIR =' Makefile >> tmp$$ mv tmp$$ $ac_file rm vpsed$$ + echo 'MULTISUBDIR =' >> $ac_file + ml_norecursion=yes + . ${multi_basedir}/config-ml.in + { ml_norecursion=; unset ml_norecursion;} ;; "testsuite/Makefile":F) cat > vpsed$$ << \_EOF s!`test -f '$<' || echo '$(srcdir)/'`!! _EOF sed -f vpsed$$ $ac_file > tmp$$ - grep '^MULTISUBDIR =' Makefile >> tmp$$ mv tmp$$ $ac_file rm vpsed$$ + echo 'MULTISUBDIR =' >> $ac_file + ml_norecursion=yes + . ${multi_basedir}/config-ml.in + { ml_norecursion=; unset ml_norecursion;} ;; "generate-headers":C) (cd include && ${MAKE-make} pch_build= ) ;; diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index e8f680526e9..e35bc0a9d51 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -404,9 +404,12 @@ AC_CONFIG_FILES(AC_FOREACH([DIR], glibcxx_SUBDIRS, [DIR/Makefile ]), s!`test -f '$<' || echo '$(srcdir)/'`!! _EOF sed -f vpsed$$ $ac_file > tmp$$ - grep '^MULTISUBDIR =' Makefile >> tmp$$ mv tmp$$ $ac_file rm vpsed$$ + echo 'MULTISUBDIR =' >> $ac_file + ml_norecursion=yes + . ${multi_basedir}/config-ml.in + AS_UNSET([ml_norecursion]) ]) AC_CONFIG_COMMANDS([generate-headers], |