diff options
| author | Sébastien Marie <semarie@users.noreply.github.com> | 2016-02-15 09:35:30 +0100 |
|---|---|---|
| committer | Sébastien Marie <semarie@users.noreply.github.com> | 2016-02-16 06:30:30 +0100 |
| commit | 263de3d0e7aa0930d4155e997985a8cff7253f77 (patch) | |
| tree | b526a541a0c7bf2e018d37b86453f9db46e96e6f | |
| parent | f3619ce026e3de5d26537de63b7d0cd7710a3b96 (diff) | |
| download | rust-263de3d0e7aa0930d4155e997985a8cff7253f77.tar.gz rust-263de3d0e7aa0930d4155e997985a8cff7253f77.zip | |
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).
| -rw-r--r-- | mk/tests.mk | 3 | ||||
| -rw-r--r-- | src/etc/maketest.py | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mk/tests.mk b/mk/tests.mk index acb75bb7cdc..b887f7b887f 100644 --- 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 1687838289b..c7d17b23bff 100644 --- 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) |