diff options
| author | Martin Povišer <povik@protonmail.com> | 2021-11-10 14:25:59 +0100 |
|---|---|---|
| committer | Martin Povišer <povik@protonmail.com> | 2021-11-10 14:25:59 +0100 |
| commit | b50d43cc947fe45aa9d8d266c2ea665c903e1934 (patch) | |
| tree | f067e9c9a45e57affd00d130b207b4e5a0c7af49 | |
| parent | a57f864975cee5ad867e26d292a1aca2097108d2 (diff) | |
| download | nixpkgs-b50d43cc947fe45aa9d8d266c2ea665c903e1934.tar nixpkgs-b50d43cc947fe45aa9d8d266c2ea665c903e1934.tar.gz nixpkgs-b50d43cc947fe45aa9d8d266c2ea665c903e1934.tar.bz2 nixpkgs-b50d43cc947fe45aa9d8d266c2ea665c903e1934.tar.lz nixpkgs-b50d43cc947fe45aa9d8d266c2ea665c903e1934.tar.xz nixpkgs-b50d43cc947fe45aa9d8d266c2ea665c903e1934.tar.zst nixpkgs-b50d43cc947fe45aa9d8d266c2ea665c903e1934.zip | |
yosys: remove pointless patching
This fixes the patch introduced in: 94a047ca74cb (yosys: fix build on darwin, 2021-11-09) Because we supply yosys with an external build of ABC, the patched ABCMKARGS variable is without influence. Even if we were building with in-tree ABC, that part of the patch is wrong, so drop it altogether.
| -rw-r--r-- | pkgs/development/compilers/yosys/fix-clang-build.patch | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/pkgs/development/compilers/yosys/fix-clang-build.patch b/pkgs/development/compilers/yosys/fix-clang-build.patch index 685841e0f75..f44d60d7e6e 100644 --- a/pkgs/development/compilers/yosys/fix-clang-build.patch +++ b/pkgs/development/compilers/yosys/fix-clang-build.patch @@ -2,19 +2,6 @@ diff --git a/Makefile b/Makefile index 86abc6958..a72f7b792 100644 --- a/Makefile +++ b/Makefile -@@ -145,7 +145,12 @@ bumpversion: - ABCREV = 4f5f73d - ABCPULL = 1 - ABCURL ?= https://github.com/YosysHQ/abc -+ -+ifneq ($(CONFIG),clang) -+ABCMKARGS = CC=clang CXX="$(CXX)" LD=clang ABC_USE_LIBSTDCXX=1 VERBOSE=$(Q) -+else - ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 VERBOSE=$(Q) -+endif - - # set ABCEXTERNAL = <abc-command> to use an external ABC instance - # Note: The in-tree ABC (yosys-abc) will not be installed when ABCEXTERNAL is set. @@ -187,7 +192,7 @@ endif endif |