diff options
| author | hainque <hainque@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-16 15:53:13 +0000 |
|---|---|---|
| committer | hainque <hainque@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-16 15:53:13 +0000 |
| commit | 8406dfc97808bf33271eb0b93dfa29c97f304530 (patch) | |
| tree | 371d30bc3dba7bea5397eeb68676024a754ba198 | |
| parent | 0fd929e6c0795b8e8fe139021137f301931a439f (diff) | |
| download | gcc-8406dfc97808bf33271eb0b93dfa29c97f304530.tar.gz | |
libgcc/
* Makefile.in (install-unwind_h): Rename into ...
(install-unwind_h-forbuild): New target.
(all): Use it instead of the former install-unwind_h.
(install-unwind_h): Reinstate, copy to user install destination
for include files, not to the internal gcc object directory one.
(install-leaf): Depend on it.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@187600 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libgcc/ChangeLog | 9 | ||||
| -rw-r--r-- | libgcc/Makefile.in | 19 |
2 files changed, 25 insertions, 3 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 0646a977c65..666757f025d 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,12 @@ +2012-05-16 Olivier Hainque <hainque@adacore.com> + + * Makefile.in (install-unwind_h): Rename into ... + (install-unwind_h-forbuild): New target. + (all): Use it instead of the former install-unwind_h. + (install-unwind_h): Reinstate, copy to user install destination + for include files, not to the internal gcc object directory one. + (install-leaf): Depend on it. + 2012-04-30 Andreas Tobler <andreast@fgznet.ch> Backport from mainline diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in index 23b72b92475..e19df8fd3e2 100644 --- a/libgcc/Makefile.in +++ b/libgcc/Makefile.in @@ -1002,13 +1002,25 @@ $(libgcc-objects) $(libgcc-s-objects) $(libgcc-eh-objects) \ $(libunwind-objects) $(libunwind-s-objects) \ $(EXTRA_PARTS): libgcc_tm.h -install-unwind_h: +# Copy unwind.h to the place where gcc will look for it at build-time +install-unwind_h-forbuild: dest=$(gcc_objdir)/include/tmp$$$$-unwind.h; \ cp unwind.h $$dest; \ chmod a+r $$dest; \ sh $(srcdir)/../move-if-change $$dest $(gcc_objdir)/include/unwind.h -all: install-unwind_h +# Copy unwind.h to the place where gcc will look at run-time, once installed +# +# This is redundant with the internal copy above when using a regular toplevel +# "install" target, because gcc's install will copy to the destination as well. +# +# This is however useful for "install-no-fixincludes" case, when only the gcc +# internal headers are copied by gcc's install. +install-unwind_h: + $(mkinstalldirs) $(DESTDIR)$(libsubdir)/include + $(INSTALL_DATA) unwind.h $(DESTDIR)$(libsubdir)/include + +all: install-unwind_h-forbuild # Documentation targets (empty). .PHONY: info html dvi pdf install-info install-html install-pdf @@ -1047,7 +1059,7 @@ install-shared: @shlib_base_name@,libgcc_s,$(subst \ @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL)))) -install-leaf: $(install-shared) $(install-libunwind) +install-leaf: $(install-shared) $(install-libunwind) install-unwind_h $(mkinstalldirs) $(DESTDIR)$(inst_libdir) $(INSTALL_DATA) libgcc.a $(DESTDIR)$(inst_libdir)/ @@ -1073,6 +1085,7 @@ install: install-leaf install-strip: install .PHONY: install install-shared install-libunwind install-strip +.PHONY: install-unwind_h install-unwind_h-forbuild # Don't export variables to the environment, in order to not confuse # configure. |