diff options
| author | Roland McGrath <roland@gnu.org> | 2003-02-21 03:02:16 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2003-02-21 03:02:16 +0000 |
| commit | 643931fb35821fdf7717e3b4be76e6b9c63dde8e (patch) | |
| tree | 4735da6cb36b5053e31f87afa3a8f44f8fe0ec12 | |
| parent | ae063ec2fbe30b9c423e486f73206983cae720e6 (diff) | |
| download | glibc-643931fb35821fdf7717e3b4be76e6b9c63dde8e.tar.gz glibc-643931fb35821fdf7717e3b4be76e6b9c63dde8e.tar.xz glibc-643931fb35821fdf7717e3b4be76e6b9c63dde8e.zip | |
2003-02-20 Roland McGrath <roland@redhat.com>
* Makerules: Clean up conditional around include of tls.make. * Make-dist: Export generating=t to prevent using that. (+distinfo): Likewise for $(shell $(MAKE) ...) runs.
| -rw-r--r-- | Make-dist | 5 | ||||
| -rw-r--r-- | Makerules | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Make-dist b/Make-dist index e757a64d3d..a5f4ddb54f 100644 --- a/Make-dist +++ b/Make-dist @@ -1,4 +1,4 @@ -# Copyright (C) 1991-2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1991-2001, 2002, 2003 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -63,7 +63,7 @@ all-headers = $(filter-out $(sysdep_headers),$(headers)) else +distinfo := $(shell MAKEFLAGS= MFLAGS= $(MAKE) -s no_deps=t \ inhibit_interface_rules=t inhibit_mach_syscalls=t \ - inhibit_timezone_rules=t \ + inhibit_timezone_rules=t generating=t \ subdirs='$(subdirs)' echo-distinfo | grep -v '^make') foo:=$(shell echo>&2 '+distinfo=$(+distinfo)') all-headers := $(patsubst +header+%,%,$(filter +header+%,$(+distinfo))) @@ -263,3 +263,4 @@ unexport distribute generated export inhibit_mach_syscalls=t export no_deps=t export inhibit_interface_rules=t +export generating=t diff --git a/Makerules b/Makerules index a4acb89571..75dfd5a2bb 100644 --- a/Makerules +++ b/Makerules @@ -1181,7 +1181,7 @@ define check-abi | diff -pu0 - $(filter %.symlist,$^) endef -ifeq ($(sysd-sorted-done)$(generating),t) +ifeq ($(firstword $(sysd-sorted-done) f)$(firstword $(generating) f),tf) -include $(common-objpfx)tls.make config-tls-yes := tls config-tls-no := notls |