diff --git a/.github/actions/compile/action.yml b/.github/actions/compile/action.yml
index 75fa3a7..84a1863 100644
--- a/.github/actions/compile/action.yml
+++ b/.github/actions/compile/action.yml
@@ -133,10 +133,10 @@ runs:
         export CLANG_PATH=$(which clang-20)
         meson setup build/ -Db_staticpic=true -Dgallium-drivers=llvmpipe -Dplatforms="[]" -Dglx=disabled -Dvulkan-drivers=swrast,nouveau,freedreno -Dopengl=false -Degl=disabled -Dgbm=disabled -Dvideo-codecs="[]"
         EXT=$([[ "${{ runner.os }}" == "macOS" ]] && echo ".dylib" || echo ".so")
-        ninja -C build src/tinymesa/libtinymesa$EXT src/tinymesa/libtinymesa_cpu$EXT
+        ninja -C build src/tinymesa/libtinymesa$EXT src/tinymesa/libtinylvp$EXT
     - name: Test loading with ctypes
       shell: bash
       run: |
         cd ${{ github.workspace }}/mesa/build/src/tinymesa
         EXT=$([[ "${{ runner.os }}" == "macOS" ]] && echo ".dylib" || echo ".so")
-        python3 -c "from ctypes import CDLL; CDLL('./libtinymesa$EXT'), CDLL('./libtinymesa_cpu$EXT')"
+        python3 -c "from ctypes import CDLL; CDLL('./libtinymesa$EXT'), CDLL('./libtinylvp$EXT')"
diff --git a/meson.build b/meson.build
index 5e182ec..51ac652 100644
--- a/meson.build
+++ b/meson.build
@@ -52,6 +52,5 @@ foreach sym : ir3_symbols
   ir3_link_args += '-Wl,-u,' + symbol_prefix + sym
 endforeach
 
-shared_library('tinymesa', link_whole : [ _libnir ], link_args : nak_link_args+ir3_link_args, link_with : [ libfreedreno_ir3, libfreedreno_common ], dependencies : [ idep_nak ])
-shared_library('tinymesa_cpu', link_whole : [ _libnir ], link_args : lvp_link_args+nak_link_args+ir3_link_args, link_with : [ libfreedreno_ir3, libfreedreno_common, libgallium ], dependencies : [ idep_nak ])
-
+tm = shared_library('tinymesa', link_whole : [ _libnir ], link_args : nak_link_args+ir3_link_args, link_with : [ libfreedreno_ir3, libfreedreno_common ], dependencies : [ idep_nak ])
+shared_library('tinylvp', link_args : lvp_link_args + [ libgallium.full_path() ], link_with : [ tm, _libmesa_util ], link_depends : libgallium, dependencies : [ dep_llvm ])