From ba3aec44fee6150d453d6dfd64accd2266f43116 Mon Sep 17 00:00:00 2001 From: umarcor Date: Tue, 26 Oct 2021 07:35:25 +0200 Subject: [PATCH] builtins/osvvm: ignore '*_c.vhd' sources if generic packages are supported --- vunit/builtins.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/vunit/builtins.py b/vunit/builtins.py index e0d4e9622..01e261776 100644 --- a/vunit/builtins.py +++ b/vunit/builtins.py @@ -165,13 +165,16 @@ def _add_osvvm(self): ): continue - if not supports_vhdl_package_generics and ( - bname - in [ - "ScoreboardGenericPkg.vhd", - "ScoreboardPkg_int.vhd", - "ScoreboardPkg_slv.vhd", - ] + if (supports_vhdl_package_generics and str(bname).endswith("_c.vhd")) or ( + not supports_vhdl_package_generics + and ( + bname + in [ + "ScoreboardGenericPkg.vhd", + "ScoreboardPkg_int.vhd", + "ScoreboardPkg_slv.vhd", + ] + ) ): continue