tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/tests/cxxrtl/run-test.sh b/tests/cxxrtl/run-test.sh
2index ee299fc82..595cd3f88 100755
3--- a/tests/cxxrtl/run-test.sh
4+++ b/tests/cxxrtl/run-test.sh
5@@ -5,7 +5,7 @@ set -ex
6 run_subtest () {
7 local subtest=$1; shift
8
9- ${CC:-gcc} -std=c++11 -O2 -o cxxrtl-test-${subtest} -I../../backends/cxxrtl/runtime test_${subtest}.cc -lstdc++
10+ ${CXX:-gcc} -std=c++11 -O2 -o cxxrtl-test-${subtest} -I../../backends/cxxrtl/runtime test_${subtest}.cc -lstdc++
11 ./cxxrtl-test-${subtest}
12 }
13
14@@ -14,4 +14,4 @@ run_subtest value_fuzz
15
16 # Compile-only test.
17 ../../yosys -p "read_verilog test_unconnected_output.v; select =*; proc; clean; write_cxxrtl cxxrtl-test-unconnected_output.cc"
18-${CC:-gcc} -std=c++11 -c -o cxxrtl-test-unconnected_output -I../../backends/cxxrtl/runtime cxxrtl-test-unconnected_output.cc
19+${CXX:-gcc} -std=c++11 -c -o cxxrtl-test-unconnected_output -I../../backends/cxxrtl/runtime cxxrtl-test-unconnected_output.cc
20diff --git a/tests/fmt/run-test.sh b/tests/fmt/run-test.sh
21index 998047f83..2a4a59f01 100644
22--- a/tests/fmt/run-test.sh
23+++ b/tests/fmt/run-test.sh
24@@ -51,7 +51,7 @@ test_cxxrtl () {
25 local subtest=$1; shift
26
27 ../../yosys -p "read_verilog ${subtest}.v; proc; clean; write_cxxrtl -print-output std::cerr yosys-${subtest}.cc"
28- ${CC:-gcc} -std=c++11 -o yosys-${subtest} -I../../backends/cxxrtl/runtime ${subtest}_tb.cc -lstdc++
29+ ${CXX:-gcc} -std=c++11 -o yosys-${subtest} -I../../backends/cxxrtl/runtime ${subtest}_tb.cc -lstdc++
30 ./yosys-${subtest} 2>yosys-${subtest}.log
31 iverilog -o iverilog-${subtest} ${subtest}.v ${subtest}_tb.v
32 ./iverilog-${subtest} |grep -v '\$finish called' >iverilog-${subtest}.log
33@@ -69,7 +69,7 @@ diff iverilog-always_full.log iverilog-always_full-1.log
34
35 ../../yosys -p "read_verilog display_lm.v" >yosys-display_lm.log
36 ../../yosys -p "read_verilog display_lm.v; write_cxxrtl yosys-display_lm.cc"
37-${CC:-gcc} -std=c++11 -o yosys-display_lm_cc -I../../backends/cxxrtl/runtime display_lm_tb.cc -lstdc++
38+${CXX:-gcc} -std=c++11 -o yosys-display_lm_cc -I../../backends/cxxrtl/runtime display_lm_tb.cc -lstdc++
39 ./yosys-display_lm_cc >yosys-display_lm_cc.log
40 for log in yosys-display_lm.log yosys-display_lm_cc.log; do
41 grep "^%l: \\\\bot\$" "$log"