about summary refs log tree commit diff
path: root/src/rt/rust_env.cpp
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-03-16 14:27:44 -0700
committerbors <bors@rust-lang.org>2013-03-16 14:27:44 -0700
commitb53da4b9dd977fdffba3f10e570d7c025238dec3 (patch)
treeffba2f796ce9bb6e36c1d083553db7bc9638f0be /src/rt/rust_env.cpp
parentebba8b4e3591c95508a4c1121784e768272a574a (diff)
parent63d18658c1d19bdcc4cad91ce808a9590b53f3d2 (diff)
downloadrust-b53da4b9dd977fdffba3f10e570d7c025238dec3.tar.gz
rust-b53da4b9dd977fdffba3f10e570d7c025238dec3.zip
auto merge of #5342 : brson/rust/debug-mem, r=brson
Fixes #5341
Diffstat (limited to 'src/rt/rust_env.cpp')
-rw-r--r--src/rt/rust_env.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rt/rust_env.cpp b/src/rt/rust_env.cpp
index b2df5f03b23..cade5f1ed2c 100644
--- a/src/rt/rust_env.cpp
+++ b/src/rt/rust_env.cpp
@@ -23,6 +23,7 @@
 #define DETAILED_LEAKS "DETAILED_LEAKS"
 #define RUST_SEED "RUST_SEED"
 #define RUST_POISON_ON_FREE "RUST_POISON_ON_FREE"
+#define RUST_DEBUG_MEM "RUST_DEBUG_MEM"
 
 #if defined(__WIN32__)
 static int
@@ -128,6 +129,7 @@ load_env(int argc, char **argv) {
     env->poison_on_free = getenv(RUST_POISON_ON_FREE) != NULL;
     env->argc = argc;
     env->argv = argv;
+    env->debug_mem = getenv(RUST_DEBUG_MEM) != NULL;
     return env;
 }