about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-05-04 17:38:39 -0700
committerbors <bors@rust-lang.org>2016-05-04 17:38:39 -0700
commit8655587c1e758ebc7fc49189a1fd89a14c851208 (patch)
tree285f8ec9540a32ed63da7f1efe8e354389d7c997 /src
parent7a0ccc458f32b2cb2dee33d7a02954a70c09c34b (diff)
parent74d1520c22943a0306c856c1fb873826c3c0760f (diff)
Auto merge of #33381 - alexcrichton:fix-nightlies, r=nikomatsakis
mk: Pass CFLAGS for target, not host

This changes the CFLAGS and related variables passed to compiletest to be passed
for the target, not the host, so we can correctly test 32-bit cross compiles on
64-bit host machines.

Hopefuly fixes #33379
Diffstat (limited to 'src')
-rw-r--r--src/tools/compiletest/src/runtest.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index fb296d57ebf..acaec0b5199 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -2063,6 +2063,11 @@ fn run_incremental_test(config: &Config, props: &TestProps, testpaths: &TestPath
 }
 
 fn run_rmake_test(config: &Config, _props: &TestProps, testpaths: &TestPaths) {
+    // FIXME(#11094): we should fix these tests
+    if config.host != config.target {
+        return
+    }
+
     let cwd = env::current_dir().unwrap();
     let src_root = config.src_base.parent().unwrap().parent().unwrap()
                                   .parent().unwrap();