From bf232aca5e911a5a005b0190a9eeb76be9d5faaf Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Tue, 11 Apr 2023 08:09:17 -0700 Subject: [PATCH] cad/surelog: Remove unnecessary element from CONFLICTS_INSTALL --- cad/surelog/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cad/surelog/Makefile b/cad/surelog/Makefile index d1c01745346e2..956a91143937e 100644 --- a/cad/surelog/Makefile +++ b/cad/surelog/Makefile @@ -39,7 +39,7 @@ CMAKE_ARGS= -DFREEBSD_JAVA_VERSION=${USE_JAVA} \ CMAKE_TESTING_ON= SURELOG_BUILD_TESTS # unclear how to run tests, see https://github.com/chipsalliance/Surelog/issues/3545 CMAKE_TESTING_TARGET= UnitTests -CONFLICTS_INSTALL= capnproto capnproto080 uhdm # bin/uhdm-dump lib/libcapnp.so +CONFLICTS_INSTALL= capnproto capnproto080 BINARY_ALIAS= python3=${PYTHON_CMD} tclsh=${TCLSH}