auto merge of #11887 : alexcrichton/rust/rpath-for-real, r=thestinger

bors · bors · commit 2ba72fa4bc6c · 2014-01-28T21:46:36.000-08:00
Closes #5219
diff --git a/Makefile.in b/Makefile.in
@@ -124,7 +124,7 @@ endif
 ifdef TRACE
   CFG_RUSTC_FLAGS += -Z trace
 endif
-ifdef DISABLE_RPATH
+ifdef CFG_DISABLE_RPATH
 # NOTE: make this CFG_RUSTC_FLAGS after stage0 snapshot
 RUSTFLAGS_STAGE1 += --no-rpath
 RUSTFLAGS_STAGE2 += --no-rpath
