OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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).
This commit is contained in:
Sébastien Marie 2016-02-15 09:35:30 +01:00
parent f3619ce026
commit 263de3d0e7
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mk/tests.mk
View File

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

1
src/etc/maketest.py
View File

@ -57,6 +57,7 @@ putenv('S', os.path.abspath(sys.argv[13]))
putenv('RUSTFLAGS', sys.argv[15]) putenv('RUSTFLAGS', sys.argv[15])
putenv('LLVM_COMPONENTS', sys.argv[16]) putenv('LLVM_COMPONENTS', sys.argv[16])
putenv('LLVM_CXXFLAGS', sys.argv[17]) putenv('LLVM_CXXFLAGS', sys.argv[17])
putenv('CXX', sys.argv[18])
putenv('PYTHON', sys.executable) putenv('PYTHON', sys.executable)
os.putenv('TARGET', target_triple) os.putenv('TARGET', target_triple)