diff options
| author | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2021-06-17 14:22:21 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2021-06-17 14:22:21 +0530 |
| commit | 6b229222fc2852775d8adac2a12f6180b32c5cea (patch) | |
| tree | c27a50ab45ab57acb47ff187724a3b0ea0682dde | |
| parent | aa9a7f629632c9180de89632d4f2c1e6039f7781 (diff) | |
| download | glibc-6b229222fc2852775d8adac2a12f6180b32c5cea.tar.gz glibc-6b229222fc2852775d8adac2a12f6180b32c5cea.tar.xz glibc-6b229222fc2852775d8adac2a12f6180b32c5cea.zip | |
Makeconfig: Fix time64-compat.mk target
The time64-compat.i needed for the time64-compat.mk Makeconfig include ends up trying to include libc-modules.h, which is not generated until later. This results in an error during build which is not noticed because it somehow does not terminate the build. Exclude the modules cppflags from the pre-processing command and fix up the time64-compat.mk target so that the build runs without issues. Reviewed-by: Andreas Schwab <schwab@linux-m68k.org>
| -rw-r--r-- | Makeconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makeconfig b/Makeconfig index b6357d0b19..6482a43025 100644 --- a/Makeconfig +++ b/Makeconfig @@ -970,7 +970,7 @@ module-cppflags-real = -include $(common-objpfx)libc-modules.h \ # facility. In fact, shlib-versions should not use it because that will # create a circular dependency as libc-modules.h is generated from # shlib-versions. -module-cppflags = $(if $(filter %.v.i,$(@F)),,$(module-cppflags-real)) +module-cppflags = $(if $(filter %.mk.i %.v.i,$(@F)),,$(module-cppflags-real)) # These are the variables that the implicit compilation rules use. # Note that we can't use -std=* in CPPFLAGS, because it overrides @@ -1239,11 +1239,11 @@ endif # $(build-shared) = yes -include $(common-objpfx)time64-compat.mk postclean-generated += time64-compat.mk -$(common-objpfx)time64-compat.mk: $(sysd-versions-force) \ - $(common-objpfx)time64-compat.i +$(common-objpfx)time64-compat.mk: $(common-objpfx)time64-compat.mk.i \ + $(sysd-versions-force) sed '/^[ ]*#/d;/^[ ]*$$/d' $< > $@T mv -f $@T $@ -$(common-objpfx)time64-compat.i: $(..)Makeconfig +$(common-objpfx)time64-compat.mk.i: $(..)Makeconfig printf "#include <time64-compat.h>\n#ifdef TIME64_NON_DEFAULT\nhave-time64-compat = yes\n#endif" \ | $(CC) -E -undef $(CPPFLAGS) -x assembler-with-cpp - > $@T mv -f $@T $@ |