From 9be49589b10514dbc517a66fbec2b3b816bed922 Mon Sep 17 00:00:00 2001 From: Carmelo Amoroso Date: Tue, 8 Jul 2008 08:05:44 +0000 Subject: Fix the test build system by installing headers on a local folder instead of using internal headers. Signed-off-by: Filippo Arcidiacono Signed-off-by: Carmelo Amoroso --- test/Rules.mak | 9 +++++++-- test/signal/Makefile | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/Rules.mak b/test/Rules.mak index f6d9fcdc2..5085ced3e 100644 --- a/test/Rules.mak +++ b/test/Rules.mak @@ -79,7 +79,11 @@ endif XWARNINGS := $(subst ",, $(strip $(WARNINGS))) -Wstrict-prototypes XARCH_CFLAGS := $(subst ",, $(strip $(ARCH_CFLAGS))) $(CPU_CFLAGS) XCOMMON_CFLAGS := -D_GNU_SOURCE -I$(top_builddir)test -CFLAGS += $(XWARNINGS) $(OPTIMIZATION) $(XCOMMON_CFLAGS) $(XARCH_CFLAGS) -I$(top_builddir)include $(PTINC) +CFLAGS := $(XWARNINGS) $(OPTIMIZATION) $(XCOMMON_CFLAGS) $(XARCH_CFLAGS) -nostdinc -I$(top_builddir)$(LOCAL_INSTALL_PATH)/usr/include + +CC_IPREFIX:=$(shell $(CC) --print-file-name=include) +CFLAGS += -I$(CC_IPREFIX) + HOST_CFLAGS += $(XWARNINGS) $(OPTIMIZATION) $(XCOMMON_CFLAGS) LDFLAGS := $(CPU_LDFLAGS) @@ -97,11 +101,12 @@ ifneq ($(strip $(HAVE_SHARED)),y) LDFLAGS += -static HOST_LDFLAGS += -static endif + LDFLAGS += -B$(top_builddir)lib -Wl,-rpath,$(top_builddir)lib -Wl,-rpath-link,$(top_builddir)lib UCLIBC_LDSO_ABSPATH=$(shell pwd) ifdef TEST_INSTALLED_UCLIBC LDFLAGS += -Wl,-rpath,./ -UCLIBC_LDSO_ABSPATH=/lib +UCLIBC_LDSO_ABSPATH=$(SHARED_LIB_LOADER_PREFIX) endif ifeq ($(findstring -static,$(LDFLAGS)),) diff --git a/test/signal/Makefile b/test/signal/Makefile index a0b14a6c9..2ff96fa73 100644 --- a/test/signal/Makefile +++ b/test/signal/Makefile @@ -1,4 +1,8 @@ # uClibc signal tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +ifeq ($(UCLIBC_HAS_OBSOLETE_BSD_SIGNAL),) +TESTS_DISABLED := tst-sigsimple +endif + include ../Test.mak -- cgit v1.2.3