diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-10-25 17:18:12 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-10-25 17:18:12 +0000 |
commit | d9732ccbecc3dd820e2f6496e792f5e839208312 (patch) | |
tree | b8f21a4f63875068370dbc498c5e7919a7a6ca3e /libc/resolv | |
parent | 12348b1583437f6382553bde4a32c2615216fec6 (diff) | |
download | eglibc2-d9732ccbecc3dd820e2f6496e792f5e839208312.tar.gz |
Merge changes between r21108 and r21352 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@21353 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/resolv')
-rw-r--r-- | libc/resolv/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libc/resolv/Makefile b/libc/resolv/Makefile index 7297408c0..2b2fcd656 100644 --- a/libc/resolv/Makefile +++ b/libc/resolv/Makefile @@ -111,17 +111,17 @@ $(objpfx)tst-leaks: $(objpfx)libresolv.so tst-leaks-ENV = MALLOC_TRACE=$(objpfx)tst-leaks.mtrace $(objpfx)mtrace-tst-leaks: $(objpfx)tst-leaks.out $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks.mtrace > $@ -# eglibc: ifeq (no,$(cross-compiling)) +ifeq ($(run-built-tests),yes) ifneq (no,$(PERL)) tests: $(objpfx)mtrace-tst-leaks endif -# eglibc: endif +endif tst-leaks2-ENV = MALLOC_TRACE=$(objpfx)tst-leaks2.mtrace $(objpfx)mtrace-tst-leaks2: $(objpfx)tst-leaks2.out $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks2.mtrace > $@ -# eglibc: ifeq (no,$(cross-compiling)) +ifeq ($(run-built-tests),yes) ifneq (no,$(PERL)) xtests: $(objpfx)mtrace-tst-leaks2 endif -# eglibc: endif +endif |