From 8a441bd5d7cba9c956b687d2afea47b1b7be1996 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sun, 20 Apr 2008 21:14:32 +0000 Subject: [PATCH] re PR libstdc++/35954 (cannot build from read-only source tree) libstdc++-v3/ PR libstdc++/35954 * include/Makefile.am (pch*_output): Do not touch pch*_output_anchor. Call 'mkdir -p' unconditionally, but ignore its return value. * include/Makefile.in: Regenerate. From-SVN: r134494 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/Makefile.am | 20 ++++---------------- libstdc++-v3/include/Makefile.in | 20 ++++---------------- 3 files changed, 13 insertions(+), 32 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 90a895bce4e..f4b180e25f2 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2008-04-20 Ralf Wildenhues + PR libstdc++/35954 + * include/Makefile.am (pch*_output): Do not touch pch*_output_anchor. + Call 'mkdir -p' unconditionally, but ignore its return value. + * include/Makefile.in: Regenerate. + * include/Makefile.am: Fix most stamp rules to regenerate the links for all sources newer than the stamp file. * include/Makefile.in: Regenerate. diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 7bfde7caa8c..e2b7412f1cd 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -1080,34 +1080,22 @@ ${host_builddir}/gthr-default.h: ${toplevel_srcdir}/gcc/${glibcxx_thread_h} \ # Build two precompiled C++ includes, stdc++.h.gch/*.gch ${pch1a_output}: ${allstamped} ${host_builddir}/c++config.h ${pch1_source} - if [ ! -d "${pch1_output_builddir}" ]; then \ - mkdir -p ${pch1_output_builddir}; \ - fi; \ + -mkdir -p ${pch1_output_builddir} $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O0 -g ${pch1_source} -o $@ - touch ${pch1_output_anchor} ${pch1b_output}: ${allstamped} ${host_builddir}/c++config.h ${pch1_source} - if [ ! -d "${pch1_output_builddir}" ]; then \ - mkdir -p ${pch1_output_builddir}; \ - fi; \ + -mkdir -p ${pch1_output_builddir} $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch1_source} -o $@ - touch ${pch1_output_anchor} # Build a precompiled TR1 include, stdtr1c++.h.gch/O2.gch ${pch2_output}: ${pch2_source} ${pch1_output} - if [ ! -d "${pch2_output_builddir}" ]; then \ - mkdir -p ${pch2_output_builddir}; \ - fi; \ + -mkdir -p ${pch2_output_builddir} $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch2_source} -o $@ - touch ${pch2_output_anchor} # Build a precompiled extension include, extc++.h.gch/O2.gch ${pch3_output}: ${pch3_source} ${pch2_output} - if [ ! -d "${pch3_output_builddir}" ]; then \ - mkdir -p ${pch3_output_builddir}; \ - fi; \ + -mkdir -p ${pch3_output_builddir} $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch3_source} -o $@ - touch ${pch3_output_anchor} # For robustness sake (in light of junk files or in-source # configuration), copy from the build or source tree to the install diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 88c976ab71d..092ad96e4fb 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -1474,34 +1474,22 @@ ${host_builddir}/gthr-default.h: ${toplevel_srcdir}/gcc/${glibcxx_thread_h} \ # Build two precompiled C++ includes, stdc++.h.gch/*.gch ${pch1a_output}: ${allstamped} ${host_builddir}/c++config.h ${pch1_source} - if [ ! -d "${pch1_output_builddir}" ]; then \ - mkdir -p ${pch1_output_builddir}; \ - fi; \ + -mkdir -p ${pch1_output_builddir} $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O0 -g ${pch1_source} -o $@ - touch ${pch1_output_anchor} ${pch1b_output}: ${allstamped} ${host_builddir}/c++config.h ${pch1_source} - if [ ! -d "${pch1_output_builddir}" ]; then \ - mkdir -p ${pch1_output_builddir}; \ - fi; \ + -mkdir -p ${pch1_output_builddir} $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch1_source} -o $@ - touch ${pch1_output_anchor} # Build a precompiled TR1 include, stdtr1c++.h.gch/O2.gch ${pch2_output}: ${pch2_source} ${pch1_output} - if [ ! -d "${pch2_output_builddir}" ]; then \ - mkdir -p ${pch2_output_builddir}; \ - fi; \ + -mkdir -p ${pch2_output_builddir} $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch2_source} -o $@ - touch ${pch2_output_anchor} # Build a precompiled extension include, extc++.h.gch/O2.gch ${pch3_output}: ${pch3_source} ${pch2_output} - if [ ! -d "${pch3_output_builddir}" ]; then \ - mkdir -p ${pch3_output_builddir}; \ - fi; \ + -mkdir -p ${pch3_output_builddir} $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch3_source} -o $@ - touch ${pch3_output_anchor} # For robustness sake (in light of junk files or in-source # configuration), copy from the build or source tree to the install -- 2.30.2