diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2006-02-14 02:51:33 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-02-14 02:51:33 +0000 |
| commit | 4a6677f09c03512c0e5c702dd05c471932c6ddb6 (patch) | |
| tree | 06a41064760a9708c7f17dc949dee21a196bdcc1 | |
| parent | 400925d81cc92de52efe6cad6dcc33794262119c (diff) | |
add support for pretty output, remove LDD, make sure we build tests as GNU_SOURCE, and link against currently compiled libs
| -rw-r--r-- | test/Rules.mak | 60 |
1 files changed, 47 insertions, 13 deletions
diff --git a/test/Rules.mak b/test/Rules.mak index 9d823d0c4..ed311a163 100644 --- a/test/Rules.mak +++ b/test/Rules.mak @@ -53,11 +53,6 @@ CROSS = $(subst ",, $(strip $(CROSS_COMPILER_PREFIX))) CC = $(CROSS)gcc STRIPTOOL = strip RM = rm -f -ifeq ($(LDSO_LDD_SUPPORT),y) -LDD = $(top_builddir)utils/ldd -else -LDD = @true -endif # Select the compiler needed to build binaries for your development system HOSTCC = gcc @@ -82,25 +77,64 @@ endif XWARNINGS = $(subst ",, $(strip $(WARNINGS))) -Wstrict-prototypes XARCH_CFLAGS = $(subst ",, $(strip $(ARCH_CFLAGS))) -CFLAGS = $(XWARNINGS) $(OPTIMIZATION) $(XARCH_CFLAGS) -GLIBC_CFLAGS += $(XWARNINGS) $(OPTIMIZATION) -LDFLAGS = +CFLAGS = $(XWARNINGS) $(OPTIMIZATION) $(XARCH_CFLAGS) -D_GNU_SOURCE +HOST_CFLAGS += $(XWARNINGS) $(OPTIMIZATION) -D_GNU_SOURCE ifeq ($(DODEBUG),y) CFLAGS += -g - GLIBC_CFLAGS += -g + HOST_CFLAGS += -g LDFLAGS += -g -Wl,-warn-common - GLIBC_LDFLAGS = -g -Wl,-warn-common + HOST_LDFLAGS = -g -Wl,-warn-common STRIPTOOL = true -Since_we_are_debugging else LDFLAGS += -s -Wl,-warn-common - GLIBC_LDFLAGS = -s -Wl,-warn-common + HOST_LDFLAGS = -s -Wl,-warn-common STRIP = $(STRIPTOOL) --remove-section=.note --remove-section=.comment $(PROG) endif ifneq ($(strip $(HAVE_SHARED)),y) LDFLAGS += -static - GLIBC_LDFLAGS += -static + HOST_LDFLAGS += -static +endif +LDFLAGS += -B$(top_builddir)lib + + +# Filter output +MAKEFLAGS += --no-print-directory +ifneq ($(findstring s,$(MAKEFLAGS)),) +DISP := sil +Q := @ +SCAT := -@true +else +ifneq ($(V)$(VERBOSE),) +DISP := ver +Q := +SCAT := cat else - LDFLAGS += -Wl,-dynamic-linker,$(top_builddir)lib/$(UCLIBC_LDSO) +DISP := pur +Q := @ +SCAT := -@true endif +endif + +banner := --------------------------------- +pur_showclean = echo " "CLEAN $(notdir $(CURDIR)) +pur_showdiff = echo " "TEST_DIFF $(notdir $(CURDIR))/ +pur_showlink = echo " "TEST_LINK $(notdir $(CURDIR))/ $@ +pur_showtest = echo " "TEST_EXEC $(notdir $(CURDIR))/ $@ +sil_showclean = +sil_showdiff = true +sil_showlink = true +sil_showtest = true +ver_showclean = +ver_showdiff = true echo +ver_showlink = true echo +ver_showtest = printf "\n$(banner)\nTEST $(notdir $(PWD))/ $@\n$(banner)\n" +do_showclean = $($(DISP)_showclean) +do_showdiff = $($(DISP)_showdiff) +do_showlink = $($(DISP)_showlink) +do_showtest = $($(DISP)_showtest) +showclean = @$(do_showclean) +showdiff = @$(do_showdiff) +showlink = @$(do_showlink) +showtest = @$(do_showtest) |