I am committing this patch from Doug Kwan on google/main.

This patch adds cpu_defines.h to the set of files to be installed.
Doug, could you describe why we need to do this?  Will you be
submitting this patch for trunk?

Tested on x86_64.  Committed on google/main.


Diego.

2011-03-15  Doug Kwan  <dougk...@google.com>
    
        Google ref 50044.
    
        PR libstdc++/48123
        * include/Makefile.am (install-freestanding-headers): Install
        cpu_defines.h
        * include/Makefile.in: Regenerate.

diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index e7f1543..d3b44bc 100644
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -1201,7 +1201,8 @@ endif
 install-freestanding-headers:
        $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}
        $(mkinstalldirs) $(DESTDIR)${host_installdir}
-       for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h; 
do \
+       for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h \
+         ${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h; do \
          $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done
        $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${std_builddir}
        $(INSTALL_DATA) ${std_builddir}/limits 
$(DESTDIR)${gxx_include_dir}/${std_builddir}
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index a93b2ea..8a23c1b 100644
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -1585,7 +1585,8 @@ ${pch3_output}: ${pch3_source} ${pch2_output}
 install-freestanding-headers:
        $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}
        $(mkinstalldirs) $(DESTDIR)${host_installdir}
-       for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h; 
do \
+       for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h \
+         ${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h; do \
          $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done
        $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${std_builddir}
        $(INSTALL_DATA) ${std_builddir}/limits 
$(DESTDIR)${gxx_include_dir}/${std_builddir}


--
This patch is available for review at http://codereview.appspot.com/4440044

Reply via email to