]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
Support --disable-fixincludes.
authorMartin Liska <mliska@suse.cz>
Wed, 31 Aug 2022 19:55:45 +0000 (21:55 +0200)
committerMartin Liska <mliska@suse.cz>
Wed, 31 Aug 2022 19:55:45 +0000 (21:55 +0200)
Always install limits.h and syslimits.h header files
to include folder.

When --disable-fixincludes is used, then no system header files
are fixed by the tools in fixincludes. Moreover, the fixincludes
tools are not built any longer.

gcc/ChangeLog:

* Makefile.in: Always install limits.h and syslimits.h to
include folder.
* configure.ac: Assign STMP_FIXINC blank if
--disable-fixincludes is used.
* configure: Regenerate.

gcc/Makefile.in
gcc/configure
gcc/configure.ac

index 203f0a15187d2c5fa64fb7a0f9d7d5e405c7a8a0..034f4677fe2414958bf9bb195101beda464ebe39 100644 (file)
@@ -3166,24 +3166,27 @@ 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; \
+         cp $(srcdir)/gsyslimits.h $${include_dir}/syslimits.h; \
        done
 # Install the README
-       rm -f include-fixed/README
-       cp $(srcdir)/../fixincludes/README-fixinc include-fixed/README
-       chmod a+r include-fixed/README
+       if [ x$(STMP_FIXINC) != x ]; then \
+         rm -f include-fixed/README; \
+         cp $(srcdir)/../fixincludes/README-fixinc include-fixed/README; \
+         chmod a+r include-fixed/README; \
+       fi;
        $(STAMP) $@
 
 .PHONY: install-gcc-tooldir
@@ -3268,13 +3271,6 @@ 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; \
-           else \
-             cp $(srcdir)/gsyslimits.h $${fix_dir}/syslimits.h; \
-           fi; \
-           chmod a+r $${fix_dir}/syslimits.h; \
          done; \
        fi
        $(STAMP) stmp-fixinc
@@ -3992,7 +3988,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 ; \
index 80498e68e36c7bd501d85990e1b180260183c50d..5c0367c0e04b643b7bef0e053f101fcf450947f9 100755 (executable)
@@ -13577,6 +13577,12 @@ then
     BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
 fi
 
+
+if test x$enable_fixincludes = xno;
+then
+    STMP_FIXINC=''
+fi
+
 # Expand extra_headers to include complete path.
 # This substitutes for lots of t-* files.
 extra_headers_list=
@@ -19703,7 +19709,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 19706 "configure"
+#line 19712 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19809,7 +19815,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 19812 "configure"
+#line 19818 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
index 819b490d1b643189cf5f795ba090b7219369a0e0..31ec7d9d38bc981c7c1bd443fcbf0f7c0fa5b926 100644 (file)
@@ -2510,6 +2510,12 @@ then
     BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
 fi
 
+
+if test x$enable_fixincludes = xno;
+then
+    STMP_FIXINC=''
+fi
+
 # Expand extra_headers to include complete path.
 # This substitutes for lots of t-* files.
 extra_headers_list=