From baff64a43d1dd17a6adea070082437d754d1ea27 Mon Sep 17 00:00:00 2001
From: Julien Margetts <56540603+margej@users.noreply.github.com>
Date: Tue, 12 Apr 2022 12:04:31 +0100
Subject: [PATCH] Add VK_USER_OBJS dependency to --create-lib library (#3370)
 (#3382).

---
 Changes          | 1 +
 src/V3EmitMk.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Changes b/Changes
index 08bbaffbd..91b355795 100644
--- a/Changes
+++ b/Changes
@@ -19,6 +19,7 @@ Verilator 4.221 devel
 * Fix Bison 3.8.2 error (#3366). [elike-ypq]
 * Fix rare bug in -Oz (V3Localize) (#3286). [Geza Lore, Shunyao CAD]
 * Fix filenames with dots overwriting debug .vpp files (#3373).
+* Fix including VK_USER_OBJS in make library (#3370). [Julien Margetts]
 
 
 Verilator 4.220 2022-03-12
diff --git a/src/V3EmitMk.cpp b/src/V3EmitMk.cpp
index e625a74a5..a39c3f3ee 100644
--- a/src/V3EmitMk.cpp
+++ b/src/V3EmitMk.cpp
@@ -248,8 +248,8 @@ public:
         }
 
         if (!v3Global.opt.libCreate().empty()) {
-            const string libCreateDeps = "$(VK_OBJS) $(VK_GLOBAL_OBJS) " + v3Global.opt.libCreate()
-                                         + ".o $(VM_HIER_LIBS)";
+            const string libCreateDeps = "$(VK_OBJS) $(VK_USER_OBJS) $(VK_GLOBAL_OBJS) "
+                                         + v3Global.opt.libCreate() + ".o $(VM_HIER_LIBS)";
             of.puts("\n### Library rules from --lib-create\n");
             // The rule to create .a is defined in verilated.mk, so just define dependency here.
             of.puts(v3Global.opt.libCreateName(false) + ": " + libCreateDeps + "\n");