diff options
| author | Luflosi <luflosi@luflosi.de> | 2024-01-16 12:27:20 +0100 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2024-01-20 11:26:38 -0600 |
| commit | 46692a1507472db12656c1e15fec8692e144bc8c (patch) | |
| tree | 364d0116f21725c77e38172cd49ea2f56a0fab66 /pkgs/development/compilers | |
| parent | a6f96f04c802608b46b70715f70d5cc25ebc77ec (diff) | |
| download | nixlib-46692a1507472db12656c1e15fec8692e144bc8c.tar nixlib-46692a1507472db12656c1e15fec8692e144bc8c.tar.gz nixlib-46692a1507472db12656c1e15fec8692e144bc8c.tar.bz2 nixlib-46692a1507472db12656c1e15fec8692e144bc8c.tar.lz nixlib-46692a1507472db12656c1e15fec8692e144bc8c.tar.xz nixlib-46692a1507472db12656c1e15fec8692e144bc8c.tar.zst nixlib-46692a1507472db12656c1e15fec8692e144bc8c.zip | |
yosys: 0.36 -> 0.37
https://github.com/YosysHQ/yosys/releases/tag/yosys-0.37
The change to the patch is needed to fix this error on macOS:
```
+ clang -std=c++11 -O2 -o cxxrtl-test-value -I../../backends/cxxrtl/runtime test_value.cc -lstdc++
test_value.cc:1:10: fatal error: 'cassert' file not found
^~~~~~~~~
1 error generated.
make: *** [Makefile:891: test] Error 1
```
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/yosys/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/yosys/fix-clang-build.patch | 15 |
2 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index dd08a92508db..850e02dc6e67 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -77,13 +77,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.36"; + version = "0.37"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "refs/tags/${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-jcaXn77OuKeC3AQTicILP3ABkJ3qBccM+uGbj1wn2Vw="; + hash = "sha256-JRztXMZMBFhdZMeVHkRxFulRrFzyuNaLzcRlmgAz6Gc="; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/yosys/fix-clang-build.patch b/pkgs/development/compilers/yosys/fix-clang-build.patch index 2581f0abab9b..843ffd6d65af 100644 --- a/pkgs/development/compilers/yosys/fix-clang-build.patch +++ b/pkgs/development/compilers/yosys/fix-clang-build.patch @@ -1,5 +1,3 @@ -diff --git a/Makefile b/Makefile -index fa95b7b70..4d15ed721 100644 --- a/Makefile +++ b/Makefile @@ -215,7 +215,7 @@ ABC_ARCHFLAGS += "-DABC_NO_RLIMIT" @@ -11,8 +9,17 @@ index fa95b7b70..4d15ed721 100644 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/cxxrtl/run-test.sh ++++ b/tests/cxxrtl/run-test.sh +@@ -5,7 +5,7 @@ set -ex + run_subtest () { + local subtest=$1; shift + +- ${CC:-gcc} -std=c++11 -O2 -o cxxrtl-test-${subtest} -I../../backends/cxxrtl/runtime test_${subtest}.cc -lstdc++ ++ ${CXX:-gcc} -std=c++11 -O2 -o cxxrtl-test-${subtest} -I../../backends/cxxrtl/runtime test_${subtest}.cc -lstdc++ + ./cxxrtl-test-${subtest} + } + --- a/tests/fmt/run-test.sh +++ b/tests/fmt/run-test.sh @@ -51,7 +51,7 @@ test_cxxrtl () { |