From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 699EF385841C; Mon, 28 Feb 2022 08:30:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 699EF385841C Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/marxin/heads/limits-to-non-fix-includes)] limits.h, syslimits.h: do not install to include-fixed X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/users/marxin/heads/limits-to-non-fix-includes X-Git-Oldrev: 50d9ca7104d40f0a331d0dd01e3c069ecf7f6c97 X-Git-Newrev: fb87da4637c7909f8d91fed7e8560e2f76e1b2d1 Message-Id: <20220228083056.699EF385841C@sourceware.org> Date: Mon, 28 Feb 2022 08:30:56 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Feb 2022 08:30:56 -0000 https://gcc.gnu.org/g:fb87da4637c7909f8d91fed7e8560e2f76e1b2d1 commit fb87da4637c7909f8d91fed7e8560e2f76e1b2d1 Author: Martin Liska Date: Mon Feb 28 09:29:41 2022 +0100 limits.h, syslimits.h: do not install to include-fixed gcc/ChangeLog: * Makefile.in: Install limits.h, syslimits.h to includes and not include-fixed. Diff: --- gcc/Makefile.in | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 31ff95500c9..7848875e109 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -3151,19 +3151,19 @@ stmp-int-hdrs: $(STMP_FIXINC) $(T_GLIMITS_H) $(T_STDINT_GCC_H) $(USER_H) fixinc_ set -e; for ml in `cat fixinc_list`; do \ sysroot_headers_suffix=`echo $${ml} | sed -e 's/;.*$$//'`; \ multi_dir=`echo $${ml} | sed -e 's/^[^;]*;//'`; \ - fix_dir=include-fixed$${multi_dir}; \ + include_dir=include$${multi_dir}; \ if $(LIMITS_H_TEST) ; then \ cat $(srcdir)/limitx.h $(T_GLIMITS_H) $(srcdir)/limity.h > tmp-xlimits.h; \ else \ cat $(T_GLIMITS_H) > tmp-xlimits.h; \ fi; \ - $(mkinstalldirs) $${fix_dir}; \ - chmod a+rx $${fix_dir} || true; \ + $(mkinstalldirs) $${include_dir}; \ + chmod a+rx $${include_dir} || true; \ $(SHELL) $(srcdir)/../move-if-change \ tmp-xlimits.h tmp-limits.h; \ - rm -f $${fix_dir}/limits.h; \ - cp -p tmp-limits.h $${fix_dir}/limits.h; \ - chmod a+r $${fix_dir}/limits.h; \ + rm -f $${include_dir}/limits.h; \ + cp -p tmp-limits.h $${include_dir}/limits.h; \ + chmod a+r $${include_dir}/limits.h; \ done # Install the README rm -f include-fixed/README @@ -3237,6 +3237,7 @@ stmp-fixinc: gsyslimits.h macro_list fixinc_list \ sysroot_headers_suffix=`echo $${ml} | sed -e 's/;.*$$//'`; \ multi_dir=`echo $${ml} | sed -e 's/^[^;]*;//'`; \ fix_dir=include-fixed$${multi_dir}; \ + include_dir=include$${multi_dir}; \ if ! $(inhibit_libc) && test ! -d ${BUILD_SYSTEM_HEADER_DIR}; then \ echo The directory that should contain system headers does not exist: >&2 ; \ echo " ${BUILD_SYSTEM_HEADER_DIR}" >&2 ; \ @@ -3253,13 +3254,15 @@ stmp-fixinc: gsyslimits.h macro_list fixinc_list \ cd $(build_objdir)/fixincludes && \ $(SHELL) ./fixinc.sh "$${gcc_dir}/$${fix_dir}" \ $(BUILD_SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS) ); \ - rm -f $${fix_dir}/syslimits.h; \ - if [ -f $${fix_dir}/limits.h ]; then \ - mv $${fix_dir}/limits.h $${fix_dir}/syslimits.h; \ + $(mkinstalldirs) $${include_dir}; \ + chmod a+rx $${include_dir} || true; \ + rm -f $${include_dir}/syslimits.h; \ + if [ -f $${include_dir}/limits.h ]; then \ + mv $${include_dir}/limits.h $${include_dir}/syslimits.h; \ else \ - cp $(srcdir)/gsyslimits.h $${fix_dir}/syslimits.h; \ + cp $(srcdir)/gsyslimits.h $${include_dir}/syslimits.h; \ fi; \ - chmod a+r $${fix_dir}/syslimits.h; \ + chmod a+r $${include_dir}/syslimits.h; \ done; \ fi $(STAMP) stmp-fixinc @@ -3977,7 +3980,7 @@ install-mkheaders: stmp-int-hdrs install-itoolsdirs \ set -e; for ml in `cat fixinc_list`; do \ multi_dir=`echo $${ml} | sed -e 's/^[^;]*;//'`; \ $(mkinstalldirs) $(DESTDIR)$(itoolsdatadir)/include$${multi_dir}; \ - $(INSTALL_DATA) include-fixed$${multi_dir}/limits.h $(DESTDIR)$(itoolsdatadir)/include$${multi_dir}/limits.h; \ + $(INSTALL_DATA) include$${multi_dir}/limits.h $(DESTDIR)$(itoolsdatadir)/include$${multi_dir}/limits.h; \ done $(INSTALL_SCRIPT) $(srcdir)/../mkinstalldirs \ $(DESTDIR)$(itoolsdir)/mkinstalldirs ; \