This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
[libstdc++,google] Make bits/stamp-bits generated by libstc++-v3/include a regular file
- From: simonb at google dot com (Simon Baldwin)
- To: libstdc++ at gcc dot gnu dot org
- Cc: gcc-patches at gcc dot gnu dot org
- Date: Mon, 7 Feb 2011 17:34:12 +0100 (CET)
- Subject: [libstdc++,google] Make bits/stamp-bits generated by libstc++-v3/include a regular file
Make bits/stamp-bits generated by libstc++-v3/include a regular file.
Building stamp-bits-sup in libstdc++-v3/include creates a bits/stamp-bits
file. Because it's generated by 'ln -s stamp-bits .', the file is a
symbolic link that points back to itself. This prevents cpio -L from
copying the built tree ("Too many levels of symbolic links").
This change removes the self-referential bits/stamp-bits and replaces it
with a regular timestamp file, allowing cpio -L to handle it cleanly.
Primarily needed for google/integration. OK?
Secondarily, equally applicable to trunk. OK there also?
libstdc++-v3/ChangeLog:
2011-02-07 Simon Baldwin <simonb@google.com>
* include/Makefile.am: Fix links built for stamp-sup-bits.
* include/Makefile.in: Rebuild.
Index: libstdc++-v3/include/Makefile.am
===================================================================
--- libstdc++-v3/include/Makefile.am (revision 169786)
+++ libstdc++-v3/include/Makefile.am (working copy)
@@ -928,6 +928,7 @@ stamp-bits: ${bits_headers}
stamp-bits-sup: stamp-bits ${bits_sup_headers}
@-cd ${bits_builddir} && $(LN_S) $? . 2>/dev/null
+ @-cd ${bits_builddir} && rm -f stamp-bits && $(STAMP) stamp-bits
@$(STAMP) stamp-bits-sup
stamp-c_base: ${c_base_headers}
Index: libstdc++-v3/include/Makefile.in
===================================================================
--- libstdc++-v3/include/Makefile.in (revision 169786)
+++ libstdc++-v3/include/Makefile.in (working copy)
@@ -1326,6 +1326,7 @@ stamp-bits: ${bits_headers}
stamp-bits-sup: stamp-bits ${bits_sup_headers}
@-cd ${bits_builddir} && $(LN_S) $? . 2>/dev/null
+ @-cd ${bits_builddir} && rm -f stamp-bits && $(STAMP) stamp-bits
@$(STAMP) stamp-bits-sup
stamp-c_base: ${c_base_headers}