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).

diff --git a/mk/tests.mk b/mk/tests.mk
index acb75bb7cdc3b0ced461a73676972e5b6b5cb16b..b887f7b887f2a0b5a4d93a7556e2e063ebd797b0 100644 (file)
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -1072,7 +1072,8 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
            $(3) \
            "$$(LLVM_LIBDIR_RUSTFLAGS_$(3))" \
            "$$(LLVM_ALL_COMPONENTS_$(3))" \
-           "$$(LLVM_CXXFLAGS_$(3))"
+           "$$(LLVM_CXXFLAGS_$(3))" \
+           '$$(CXX_$(3))'
        @touch -r $$@.start_time $$@ && rm $$@.start_time
 else
 # FIXME #11094 - The above rule doesn't work right for multiple targets

diff --git a/src/etc/maketest.py b/src/etc/maketest.py
index 1687838289babc0bd42cb11587fa995864e07435..c7d17b23bffff6f9f467ea2fadc5f674b86b9eb7 100644 (file)
--- a/src/etc/maketest.py
+++ b/src/etc/maketest.py
@@ -57,6 +57,7 @@ putenv('S', os.path.abspath(sys.argv[13]))
 putenv('RUSTFLAGS', sys.argv[15])
 putenv('LLVM_COMPONENTS', sys.argv[16])
 putenv('LLVM_CXXFLAGS', sys.argv[17])
+putenv('CXX', sys.argv[18])
 putenv('PYTHON', sys.executable)
 os.putenv('TARGET', target_triple)