From b50d43cc947fe45aa9d8d266c2ea665c903e1934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Povi=C5=A1er?= Date: Wed, 10 Nov 2021 14:25:59 +0100 Subject: [PATCH] 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. --- .../compilers/yosys/fix-clang-build.patch | 13 ------------- 1 file changed, 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 = 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