Skip to content

evmc: Remove redundant build configuration#1505

Merged
chfast merged 1 commit into
masterfrom
evmc/cleanup
Apr 9, 2026
Merged

evmc: Remove redundant build configuration#1505
chfast merged 1 commit into
masterfrom
evmc/cleanup

Conversation

@chfast

@chfast chfast commented Apr 9, 2026

Copy link
Copy Markdown
Member

Now that EVMC is part of the evmone project, its CMakeLists.txt no longer needs its own project(), compiler settings, Cable includes, or build type configuration — all provided by the root CMakeLists.txt.

Now that EVMC is part of the evmone project, its CMakeLists.txt no
longer needs its own project(), compiler settings, Cable includes, or
build type configuration — all provided by the root CMakeLists.txt.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR simplifies the EVMC subproject CMake configuration now that EVMC is built as part of the evmone superproject, relying on the root build configuration rather than duplicating it.

Changes:

  • Removed EVMC’s redundant project(), Cable includes/toolchain/compiler settings, build-type, and coverage flag configuration from evmc/CMakeLists.txt.
  • Switched EVMC_INCLUDE_DIR to use CMAKE_CURRENT_SOURCE_DIR to remain correct without a local project() call.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@codecov

codecov Bot commented Apr 9, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 96.74%. Comparing base (89d3100) to head (f44ff8b).
⚠️ Report is 1 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1505   +/-   ##
=======================================
  Coverage   96.74%   96.74%           
=======================================
  Files         155      155           
  Lines       14001    14001           
  Branches     3273     3273           
=======================================
  Hits        13545    13545           
  Misses        313      313           
  Partials      143      143           
Flag Coverage Δ
eest-develop 92.76% <ø> (ø)
eest-develop-gmp 27.93% <ø> (ø)
eest-legacy 15.22% <ø> (ø)
eest-libsecp256k1 29.65% <ø> (ø)
evmone-unittests 91.48% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
core 95.94% <ø> (ø)
tooling 85.01% <ø> (ø)
tests 99.77% <ø> (ø)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@chfast chfast merged commit 2db5be3 into master Apr 9, 2026
27 checks passed
@chfast chfast deleted the evmc/cleanup branch April 9, 2026 21:09
somnergy pushed a commit to erigontech/zvm1 that referenced this pull request May 23, 2026
Merges upstream evmone (ipsilon/evmone) master through commit ff942e2
into zevmone main. Brings in the post-EVMC-vendoring upstream commits:

  - evmone 0.20.0 and 0.21.0 releases
  - EVMC vendoring follow-ups: remove loader library and old evmc tool
    (ipsilon#1504), drop external EVMC support in evmone-bench (ipsilon#1503), add
    standalone evmone CLI tool (ipsilon#1502), bump CMake to 3.22 (ipsilon#1501),
    remove redundant build configuration (ipsilon#1505)
  - Add Amsterdam EVM revision (ipsilon#1508)
  - Implement DUPN/SWAPN/EXCHANGE EIP-8024 (ipsilon#1429)
  - Extract SWAP instruction helper (ipsilon#1509)
  - Restrict conjugate() to degree-2 extension fields (ipsilon#1485)
  - Add missing inline keyword to always_inline functions (ipsilon#1510)
  - CI updates: run EEST develop (ipsilon#1507), drop legacy state tests
    (ipsilon#1512), set LLVM_PROFILE_FILE per run (ipsilon#1513)

Conflict resolution (matches the existing merge-upstream branch):
  - Adopt upstream's parameterized run_execution_spec_tests command and
    upstream-style call sites (release/fixtures_suffix/filter); drop the
    duplicate non-parameterized definition merged in from HEAD
  - circle.yml gcc-min job: rename CMAKE_OPTIONS=-DEVMC_TOOLS=OFF to
    -DEVMONE_TOOLS=OFF (option moved to evmone scope after vendoring)
  - .bumpversion.cfg, CHANGELOG.md, CMakeLists.txt: take upstream
  - evmc/* (add/add): take upstream's vendored EVMC tree
  - lib/evmone_precompiles/ecc.hpp: keep test_bit() helper (not yet in
    upstream intx)
  - lib/evmone_precompiles/modexp.cpp: keep SP1 modexp_sp1() function
    and its dispatch alongside upstream's bump-allocator refactor
  - test/integration/CMakeLists.txt: take upstream
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants