conflict

1 files changed, 4 insertions, 0 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 57e08c4e6dd0..e136c048ed79 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -39,6 +39,10 @@ package() {
   for _arch in ${_architectures}; do
     cd "${srcdir}/glslang-${pkgver}/build-${_arch}"
     make DESTDIR="${pkgdir}" install
+    # Delete the stuff that's been vendored in. It's not ideal but that's we'll deal with for now.
+    mv "${pkgdir}"/usr/${_arch}/bin/spirv-remap.exe .
+    rm -r "${pkgdir}"/usr/${_arch}/{bin/spirv*,include/spirv-tools,SPIRV-Tools*,lib/libSPIRV-*,lib/pkgconfig}
+    mv spirv-remap.exe "${pkgdir}"/usr/${_arch}/bin/spirv-remap.exe
     ${_arch}-strip -g "${pkgdir}"/usr/${_arch}/lib/*.a
 #     ${_arch}-strip --strip-unneeded "${pkgdir}"/usr/${_arch}/bin/*.dll
     install -d "$pkgdir"/usr/bin