From e85f1d6af4dbeb39a391cab003ced4567ffecd14 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 22 May 2008 00:04:21 +0000 Subject: * 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]. --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 43c4f4d..437854e 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) > $@ -- cgit v1.1