Revert "spirv-llvm-translator: move spirv-tools to nativeBuildInputs"

This reverts commit 69a71a0ec2da81a4213e1f0ceedb95545d9e2414.

Previously, the only use for spirv-tools was its commands being used
to run tests, but now, spirv-llvm-translator also links against its
libraries.  Tests won't be run when cross compiling to a
non-compatible architecture anyway, so to keep spirv-llvm-translator
cross compiling, we should move spirv-tools back to being a build
input so that the libraries can be found.  We could try to convince
CMake to use SPIRV-Tools.cmake from the host spirv-tools and
SPIRV-Tools-tools.cmake from the build spirv-tools, but since we never
actually need both when cross compiling it's not worth it.

This fixes the cross build LLVM/SPIRV-LLVM-Translator 16.
This commit is contained in:
Alyssa Ross 2023-11-02 23:31:01 +01:00
parent 36824b3f61
commit a9fd593f39
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0

@ -55,10 +55,10 @@ stdenv.mkDerivation {
})
];
nativeBuildInputs = [ pkg-config cmake spirv-tools ]
nativeBuildInputs = [ pkg-config cmake ]
++ (if isROCm then [ llvm ] else [ llvm.dev ]);
buildInputs = [ spirv-headers ]
buildInputs = [ spirv-headers spirv-tools ]
++ lib.optionals (!isROCm) [ llvm ];
nativeCheckInputs = [ lit ];