diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-10-24 21:42:39 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2010-10-24 21:42:39 -0400 |
| commit | bc96fbda275c305ddc1b0b6d94fc68d81369221a (patch) | |
| tree | fd1ad111667a70db4b2f4e05929cab46bdedba49 /Makeconfig | |
| parent | 22cd1c9bcf57c5829d65b6da825f7a459d40c9eb (diff) | |
| download | glibc-bc96fbda275c305ddc1b0b6d94fc68d81369221a.tar.gz | |
Work around shortest-stem feature in make 3.82+
Diffstat (limited to 'Makeconfig')
| -rw-r--r-- | Makeconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makeconfig b/Makeconfig index c5a58f2abf..e5cbf646fa 100644 --- a/Makeconfig +++ b/Makeconfig @@ -695,7 +695,7 @@ CPPFLAGS = $($(subdir)-CPPFLAGS) $(+includes) $(defines) \ -include $(..)include/libc-symbols.h $(sysdep-CPPFLAGS) \ $(CPPFLAGS-$(suffix $@)) \ $(foreach lib,$(libof-$(basename $(@F))) \ - $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \ + $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \ $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F))) override CFLAGS = -std=gnu99 $(gnu89-inline-CFLAGS) \ $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \ @@ -966,7 +966,7 @@ endif # emitted into sysd-rules. A sysdeps Makeconfig fragment can # add its own special object file prefix to this list with e.g. foo-%:% # to have foo-*.? compiled from *.? using $(foo-CPPFLAGS). -sysd-rules-patterns := %:% rtld-%:% m_%:s_% +sysd-rules-patterns := %:% rtld-%:rtld-% rtld-%:% m_%:s_% # Let sysdeps/ subdirs contain a Makeconfig fragment for us to include here. sysdep-makeconfigs := $(wildcard $(+sysdep_dirs:=/Makeconfig)) @@ -975,8 +975,8 @@ include $(sysdep-makeconfigs) endif # Compute just the target patterns. Makeconfig has set sysd-rules-patterns. -sysd-rules-targets := $(foreach p,$(sysd-rules-patterns),\ - $(firstword $(subst :, ,$p))) +sysd-rules-targets := $(sort $(foreach p,$(sysd-rules-patterns),\ + $(firstword $(subst :, ,$p)))) endif # Makeconfig not yet included |