aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorGraydon Hoare <[email protected]>2010-08-10 13:26:00 -0700
committerGraydon Hoare <[email protected]>2010-08-10 13:26:00 -0700
commitdbe8760af3b50bfa14d39406fe0eca2f2b82d8ec (patch)
treec5f89fa72e9c28ced0a533a498d64eee30f26f3f /src/Makefile
parentFix a deque size bookkeeping bug. (diff)
parentAdd names to tasks and domains. These can either be an explicit literal string (diff)
downloadrust-dbe8760af3b50bfa14d39406fe0eca2f2b82d8ec.tar.xz
rust-dbe8760af3b50bfa14d39406fe0eca2f2b82d8ec.zip
Merge commit 'jyasskin/work'
Conflicts: src/rt/rust_dom.cpp src/rt/rust_upcall.cpp
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index 38327b6b..496457bb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -472,7 +472,6 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \
i32-sub.rs \
i8-incr.rs \
import.rs \
- inner-module.rs \
integral-indexing.rs \
int-lib.rs \
iter-range.rs \