about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLuca Bruno <lucab@debian.org>2014-03-02 20:02:42 +0100
committerLuca Bruno <lucab@debian.org>2014-03-02 20:02:42 +0100
commit357cadf722c55b4b4d379503c33bc791ea6e1cab (patch)
tree8a7b2b337390b7d1940455942003cb0679009f29
parent1e2f572fb63a37df2c1438de68b1e8cc11c75275 (diff)
downloadrust-357cadf722c55b4b4d379503c33bc791ea6e1cab.tar.gz
rust-357cadf722c55b4b4d379503c33bc791ea6e1cab.zip
travis: remove manually added RUSTFLAGS
Indirect dependencies should now be picked up through the
autogenerated llvmdeps.rs instead.

Signed-off-by: Luca Bruno <lucab@debian.org>
-rw-r--r--.travis.yml7
1 files changed, 1 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 310d3f4111f..e124ca571de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,16 +26,11 @@ before_script:
 # Note that this is meant to run in a "fairly small" amount of time, so this
 # isn't exhaustive at all.
 #
-# The "-lffi and -lncurses" are required for LLVM. The LLVM that rust builds
-# manually disables bringing in these two libraries, but the stock LLVM was
-# apparently built with these options. We provide these options when building so
-# the `rustc` binary can successfully link.
-#
 # As a result of https://github.com/travis-ci/travis-ci/issues/1066, we run
 # everything in one large command instead of multiple commands.
 script: |
   make tidy &&
-  RUSTFLAGS="-C link-args='-lffi -lncurses'" make -j4 rustc-stage1 &&
+  make -j4 rustc-stage1 &&
   make check-stage1-std check-stage1-rpass check-stage1-cfail check-stage1-rfail
 
 env: