mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-22 21:53:32 +00:00
b82d963e7b
https://github.com/YosysHQ/yosys/releases/tag/yosys-0.33 A patch needed to be adapted to fix this error on macOS: ``` + clang -std=c++11 -o yosys-always_full -I../.. always_full_tb.cc -lstdc++ In file included from always_full_tb.cc:1: In file included from ./yosys-always_full.cc:1: ../../backends/cxxrtl/cxxrtl.h:29:10: fatal error: 'cstddef' file not found #include <cstddef> ^~~~~~~~~ 1 error generated. make: *** [Makefile:885: test] Error 1 ```
36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index fa95b7b70..4d15ed721 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -215,7 +215,7 @@ ABC_ARCHFLAGS += "-DABC_NO_RLIMIT"
|
|
endif
|
|
|
|
ifeq ($(CONFIG),clang)
|
|
-CXX = clang
|
|
+CXX = clang++
|
|
LD = clang++
|
|
CXXFLAGS += -std=$(CXXSTD) -Os
|
|
ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H -Wno-c++11-narrowing $(ABC_ARCHFLAGS)"
|
|
diff --git a/tests/fmt/run-test.sh b/tests/fmt/run-test.sh
|
|
index 914a72347..bc0b129d2 100644
|
|
--- a/tests/fmt/run-test.sh
|
|
+++ b/tests/fmt/run-test.sh
|
|
@@ -51,7 +51,7 @@ test_cxxrtl () {
|
|
local subtest=$1; shift
|
|
|
|
../../yosys -p "read_verilog ${subtest}.v; proc; clean; write_cxxrtl -print-output std::cerr yosys-${subtest}.cc"
|
|
- ${CC:-gcc} -std=c++11 -o yosys-${subtest} -I../.. ${subtest}_tb.cc -lstdc++
|
|
+ ${CXX:-gcc} -std=c++11 -o yosys-${subtest} -I../.. ${subtest}_tb.cc -lstdc++
|
|
./yosys-${subtest} 2>yosys-${subtest}.log
|
|
iverilog -o iverilog-${subtest} ${subtest}.v ${subtest}_tb.v
|
|
./iverilog-${subtest} |grep -v '\$finish called' >iverilog-${subtest}.log
|
|
@@ -69,7 +69,7 @@ diff iverilog-always_full.log iverilog-always_full-1.log
|
|
|
|
../../yosys -p "read_verilog display_lm.v" >yosys-display_lm.log
|
|
../../yosys -p "read_verilog display_lm.v; write_cxxrtl yosys-display_lm.cc"
|
|
-${CC:-gcc} -std=c++11 -o yosys-display_lm_cc -I../.. display_lm_tb.cc -lstdc++
|
|
+${CXX:-gcc} -std=c++11 -o yosys-display_lm_cc -I../.. display_lm_tb.cc -lstdc++
|
|
./yosys-display_lm_cc >yosys-display_lm_cc.log
|
|
for log in yosys-display_lm.log yosys-display_lm_cc.log; do
|
|
grep "^%l: \\\\bot\$" "$log"
|