diff --git a/Changes b/Changes index c0188f094..270e7fdf8 100644 --- a/Changes +++ b/Changes @@ -36,6 +36,7 @@ Verilator 5.033 devel * Fix `BLKSEQ` on suspendable processes (#5722). [Krzysztof Bieganski, Antmicro Ltd.] * Fix vpiDefName issues with non-inlined scopes and dpi conflicts (#5732). [Andrew Nolte] * Fix duplicate-named class variable equivalence (#5737). +* Fix `-j` ignored after `-f` (#5749). [Luca Colagrande] * Fix matching language extension options including dots. diff --git a/src/V3Options.cpp b/src/V3Options.cpp index f4dc0f573..ce99fbebd 100644 --- a/src/V3Options.cpp +++ b/src/V3Options.cpp @@ -955,9 +955,6 @@ void V3Options::notify() VL_MT_DISABLED { cmdfl->v3error("Unsupported: --timing and --savable not supported together"); } - // Mark options as available - m_available = true; - // --dump-tree-dot will turn on tree dumping. if (!m_dumpLevel.count("tree") && m_dumpLevel.count("tree-dot")) { m_dumpLevel["tree"] = m_dumpLevel["tree-dot"]; @@ -965,9 +962,15 @@ void V3Options::notify() VL_MT_DISABLED { // Sanity check of expected configuration UASSERT(threads() >= 1, "'threads()' must return a value >= 1"); + if (m_buildJobs == -1) m_buildJobs = 1; + if (m_verilateJobs == -1) m_verilateJobs = 1; // Preprocessor defines based on options used if (timing().isSetTrue()) V3PreShell::defineCmdLine("VERILATOR_TIMING", "1"); + + // === Leave last + // Mark options as available + m_available = true; } //###################################################################### @@ -1853,8 +1856,6 @@ void V3Options::parseOptsList(FileLine* fl, const string& optdir, int argc, ++i; } } - if (m_buildJobs == -1) m_buildJobs = 1; - if (m_verilateJobs == -1) m_verilateJobs = 1; } //======================================================================