summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/Makefile1
-rw-r--r--test/Rules.mak9
-rw-r--r--test/Test.mak1
3 files changed, 6 insertions, 5 deletions
diff --git a/test/Makefile b/test/Makefile
index 98f88e66c..b306045cb 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -6,7 +6,6 @@
#
top_builddir=../
--include $(top_builddir).config
include Rules.mak
ALL_SUBDIRS := $(patsubst %/Makefile,%,$(wildcard */Makefile))
diff --git a/test/Rules.mak b/test/Rules.mak
index 72a922797..ee080aab3 100644
--- a/test/Rules.mak
+++ b/test/Rules.mak
@@ -9,10 +9,10 @@
# Note: This does not read the top level Rules.mak file
#
-top_builddir = ../../
+top_builddir ?= ../
TESTDIR=$(top_builddir)test/
--include $(top_builddir).config
+include $(top_builddir)/Rules.mak
UCLIBC_LDSO ?= $(firstword $(wildcard $(top_builddir)lib/ld*))
@@ -69,11 +69,12 @@ OPTIMIZATION += $(call check_gcc,-Os,-O2)
endif
XWARNINGS := $(subst ",, $(strip $(WARNINGS))) -Wstrict-prototypes
-XARCH_CFLAGS := $(subst ",, $(strip $(ARCH_CFLAGS)))
+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
+CFLAGS += $(XWARNINGS) $(OPTIMIZATION) $(XCOMMON_CFLAGS) $(XARCH_CFLAGS) -I$(top_builddir)include $(PTINC)
HOST_CFLAGS += $(XWARNINGS) $(OPTIMIZATION) $(XCOMMON_CFLAGS)
+LDFLAGS := $(CPU_LDFLAGS)
ifeq ($(DODEBUG),y)
CFLAGS += -g
HOST_CFLAGS += -g
diff --git a/test/Test.mak b/test/Test.mak
index 6477e26ad..9123d288f 100644
--- a/test/Test.mak
+++ b/test/Test.mak
@@ -18,6 +18,7 @@ ifneq ($(filter-out test,$(TESTS)),$(TESTS))
$(error Sanity check: cannot have a test named "test.c")
endif
+top_builddir = ../../
include ../Rules.mak
U_TARGETS := $(TESTS)