Skip to content

Commit

Permalink
mk: Pass CFLAGS for target, not host
Browse files Browse the repository at this point in the history
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
  • Loading branch information
alexcrichton committed May 3, 2016
1 parent 3157691 commit 74d1520
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
10 changes: 5 additions & 5 deletions mk/tests.mk
Expand Up @@ -636,11 +636,11 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
--host-rustcflags "$(RUSTC_FLAGS_$(3)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(3))" \
--lldb-python-dir=$(CFG_LLDB_PYTHON_DIR) \
--target-rustcflags "$(RUSTC_FLAGS_$(2)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(2))" \
--cc '$$(CC_$(3))' \
--cxx '$$(CXX_$(3))' \
--cflags "$$(CFG_GCCISH_CFLAGS_$(3))" \
--llvm-components "$$(LLVM_ALL_COMPONENTS_$(3))" \
--llvm-cxxflags "$$(LLVM_CXXFLAGS_$(3))" \
--cc '$$(CC_$(2))' \
--cxx '$$(CXX_$(2))' \
--cflags "$$(CFG_GCCISH_CFLAGS_$(2))" \
--llvm-components "$$(LLVM_ALL_COMPONENTS_$(2))" \
--llvm-cxxflags "$$(LLVM_CXXFLAGS_$(2))" \
$$(CTEST_TESTARGS)

ifdef CFG_VALGRIND_RPASS
Expand Down
5 changes: 5 additions & 0 deletions src/tools/compiletest/src/runtest.rs
Expand Up @@ -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();
Expand Down

0 comments on commit 74d1520

Please sign in to comment.