aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraydon Hoare <[email protected]>2010-10-22 17:54:27 -0700
committerGraydon Hoare <[email protected]>2010-10-22 17:54:27 -0700
commita0867e0ccfdbdb910a2aeebe283e5734cadeb688 (patch)
tree0741e11602d85877f550f24d8630493f2a4f4b17
parentDon't use string == in x86.rs, doesn't work. (diff)
downloadrust-a0867e0ccfdbdb910a2aeebe283e5734cadeb688.tar.xz
rust-a0867e0ccfdbdb910a2aeebe283e5734cadeb688.zip
More fire-fighting.
-rw-r--r--src/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile
index f387a08d..94a0a75c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -518,6 +518,9 @@ TEST_XFAILS_X86 += test/run-pass/native-mod.rc
TEST_XFAILS_LLVM += test/run-pass/native-mod.rc
TEST_XFAILS_SELF += test/run-pass/native-mod.rc
endif
+ifeq ($(CFG_OSTYPE), Darwin)
+TEST_XFAILS_SELF += $(wildcard test/*/*.rs)
+endif
RPASS_RC := $(wildcard test/run-pass/*.rc)
RPASS_RS := $(wildcard test/run-pass/*.rs)
@@ -923,9 +926,9 @@ clean:
$(CFG_QUIET)rm -f $(CFG_BOOT) $(CFG_RUNTIME) $(CFG_STDLIB)
$(CFG_QUIET)rm -Rf $(PKG_NAME)-*.tar.gz dist
$(CFG_QUIET)rm -f $(foreach ext,cmx cmi cmo cma o a d exe,\
- $(wildcard boot/*/*.$(ext) boot/*/*/*.$(ext))) \
- $(CFG_QUIET)rm -f $(foreach ext,out llvm x86 o s exe dSYM,\
- $(wildcard test/*/*.$(ext))) \
+ $(wildcard boot/*/*.$(ext) boot/*/*/*.$(ext)))
+ $(CFG_QUIET)rm -Rf $(foreach ext,out llvm x86 o s exe dSYM,\
+ $(wildcard test/*/*.$(ext)))
# Local Variables: