Skip to content

Commit 8655587

Browse files
committed
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
2 parents 7a0ccc4 + 74d1520 commit 8655587

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

mk/tests.mk

+5-5
Original file line numberDiff line numberDiff line change
@@ -636,11 +636,11 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
636636
--host-rustcflags "$(RUSTC_FLAGS_$(3)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(3))" \
637637
--lldb-python-dir=$(CFG_LLDB_PYTHON_DIR) \
638638
--target-rustcflags "$(RUSTC_FLAGS_$(2)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(2))" \
639-
--cc '$$(CC_$(3))' \
640-
--cxx '$$(CXX_$(3))' \
641-
--cflags "$$(CFG_GCCISH_CFLAGS_$(3))" \
642-
--llvm-components "$$(LLVM_ALL_COMPONENTS_$(3))" \
643-
--llvm-cxxflags "$$(LLVM_CXXFLAGS_$(3))" \
639+
--cc '$$(CC_$(2))' \
640+
--cxx '$$(CXX_$(2))' \
641+
--cflags "$$(CFG_GCCISH_CFLAGS_$(2))" \
642+
--llvm-components "$$(LLVM_ALL_COMPONENTS_$(2))" \
643+
--llvm-cxxflags "$$(LLVM_CXXFLAGS_$(2))" \
644644
$$(CTEST_TESTARGS)
645645

646646
ifdef CFG_VALGRIND_RPASS

src/tools/compiletest/src/runtest.rs

+5
Original file line numberDiff line numberDiff line change
@@ -2063,6 +2063,11 @@ fn run_incremental_test(config: &Config, props: &TestProps, testpaths: &TestPath
20632063
}
20642064

20652065
fn run_rmake_test(config: &Config, _props: &TestProps, testpaths: &TestPaths) {
2066+
// FIXME(#11094): we should fix these tests
2067+
if config.host != config.target {
2068+
return
2069+
}
2070+
20662071
let cwd = env::current_dir().unwrap();
20672072
let src_root = config.src_base.parent().unwrap().parent().unwrap()
20682073
.parent().unwrap();

0 commit comments

Comments
 (0)