aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2008-05-22 00:04:21 +0000
committerRoland McGrath <roland@gnu.org>2008-05-22 00:04:21 +0000
commite85f1d6af4dbeb39a391cab003ced4567ffecd14 (patch)
tree7477d3173667d07d2b9e10994157fad5b19d00a0 /Makefile
parent6fa165975fcfc758243633559b0022f2d1f4acfe (diff)
downloadglibc-e85f1d6af4dbeb39a391cab003ced4567ffecd14.tar
glibc-e85f1d6af4dbeb39a391cab003ced4567ffecd14.tar.gz
glibc-e85f1d6af4dbeb39a391cab003ced4567ffecd14.tar.bz2
glibc-e85f1d6af4dbeb39a391cab003ced4567ffecd14.zip
* shlib-versions (sparc.*-.*-.*, sparc64.*-.*-.*): Add ABI lines.
* Makefile (check-data): Use $(abi-name) before other guesses. Look in $(add-ons) dirs before scripts/data/. * elf/Makefile (check-data): Likewise. * scripts/soversions.awk: Grok ABI line. * Makeconfig ($(common-objpfx)soversions.mk): Likewise. Emit definition for abi-name variable. if [__USE_BSD].
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 8 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 43c4f4d4b5..437854ed33 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-# Copyright (C) 1991-2002,2003,2004,2005,2006 Free Software Foundation, Inc.
+# Copyright (C) 1991-2002,2003,2004,2005,2006,2008
+# 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
@@ -246,8 +247,12 @@ tests-clean:
tests: $(objpfx)c++-types-check.out $(objpfx)check-local-headers.out
ifneq ($(CXX),no)
check-data := $(firstword $(wildcard \
- $(foreach M,$(config-machine) $(base-machine),\
- scripts/data/c++-types-$M-$(config-os).data)))
+ $(foreach D,$(add-ons) scripts/data,\
+ $(patsubst %,$D/c++-types-%.data,\
+ $(abi-name) \
+ $(addsuffix -$(config-os),\
+ $(config-machine) \
+ $(base-machine))))))
ifneq (,$(check-data))
$(objpfx)c++-types-check.out: $(check-data) scripts/check-c++-types.sh
scripts/check-c++-types.sh $< $(CXX) $(filter-out -std=gnu99 -Wstrict-prototypes,$(CFLAGS)) $(CPPFLAGS) > $@