AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 22:10:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

2003-02-20 Roland McGrath <roland@redhat.com>

Browse Source 
* Makerules: Clean up conditional around include of tls.make.
	* Make-dist: Export generating=t to prevent using that.
	(+distinfo): Likewise for $(shell $(MAKE) ...) runs.
This commit is contained in:
Roland McGrath 2003-02-21 03:02:16 +00:00
parent ae063ec2fb
commit 643931fb35
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Make-dist
View File

@ -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. # This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or # 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 else
+distinfo := $(shell MAKEFLAGS= MFLAGS= $(MAKE) -s no_deps=t \ +distinfo := $(shell MAKEFLAGS= MFLAGS= $(MAKE) -s no_deps=t \
inhibit_interface_rules=t inhibit_mach_syscalls=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') subdirs='$(subdirs)' echo-distinfo | grep -v '^make')
foo:=$(shell echo>&2 '+distinfo=$(+distinfo)') foo:=$(shell echo>&2 '+distinfo=$(+distinfo)')
all-headers := $(patsubst +header+%,%,$(filter +header+%,$(+distinfo))) all-headers := $(patsubst +header+%,%,$(filter +header+%,$(+distinfo)))
@ -263,3 +263,4 @@ unexport distribute generated
export inhibit_mach_syscalls=t export inhibit_mach_syscalls=t
export no_deps=t export no_deps=t
export inhibit_interface_rules=t export inhibit_interface_rules=t
export generating=t

2
Makerules
View File

@ -1181,7 +1181,7 @@ define check-abi
| diff -pu0 - $(filter %.symlist,$^) | diff -pu0 - $(filter %.symlist,$^)
endef endef
ifeq ($(sysd-sorted-done)$(generating),t) ifeq ($(firstword $(sysd-sorted-done) f)$(firstword $(generating) f),tf)
-include $(common-objpfx)tls.make -include $(common-objpfx)tls.make
config-tls-yes := tls config-tls-yes := tls
config-tls-no := notls config-tls-no := notls