about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-01-07 17:46:04 +0000
committerbors <bors@rust-lang.org>2016-01-07 17:46:04 +0000
commit25d1f4bc21a2ab77e12ebcd8c5fb479b563d3bf7 (patch)
tree0c645baa90fb187ddbcd0a92e5906094f0618e24
parent03f49502391a45e4b021c332dc9f38a05087b84a (diff)
parentb043ded802695c14dbd0014a1b06032b37ad2b4b (diff)
Auto merge of #30739 - pnkfelix:finish-enable-rpath-by-default, r=dotdash
finish enabling `-C rpath` by default in rustc. See #30353.
-rw-r--r--mk/main.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/main.mk b/mk/main.mk
index 2de18c9871a..4c4722a76b9 100644
--- a/mk/main.mk
+++ b/mk/main.mk
@@ -149,7 +149,7 @@ endif
 ifdef TRACE
   CFG_RUSTC_FLAGS += -Z trace
 endif
-ifdef CFG_ENABLE_RPATH
+ifndef CFG_DISABLE_RPATH
 CFG_RUSTC_FLAGS += -C rpath
 endif