Skip to content

Commit 263de3d

Browse files
committed
pass CXX to run-make
use CXX value found at configure time inside run-make tests. it permits OpenBSD to pass llvm-module-pass test (which use CXX variable).
1 parent f3619ce commit 263de3d

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

mk/tests.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,8 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
10721072
$(3) \
10731073
"$$(LLVM_LIBDIR_RUSTFLAGS_$(3))" \
10741074
"$$(LLVM_ALL_COMPONENTS_$(3))" \
1075-
"$$(LLVM_CXXFLAGS_$(3))"
1075+
"$$(LLVM_CXXFLAGS_$(3))" \
1076+
'$$(CXX_$(3))'
10761077
@touch -r [email protected]_time $$@ && rm [email protected]_time
10771078
else
10781079
# FIXME #11094 - The above rule doesn't work right for multiple targets

src/etc/maketest.py

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ def convert_path_spec(name, value):
5757
putenv('RUSTFLAGS', sys.argv[15])
5858
putenv('LLVM_COMPONENTS', sys.argv[16])
5959
putenv('LLVM_CXXFLAGS', sys.argv[17])
60+
putenv('CXX', sys.argv[18])
6061
putenv('PYTHON', sys.executable)
6162
os.putenv('TARGET', target_triple)
6263

0 commit comments

Comments
 (0)