Skip to content

Commit 2b7f2a7

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 3157691 + 4d7dcc6 commit 2b7f2a7

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-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

0 commit comments

Comments
 (0)