Merge pull request #138454 from trofi/fix-osl
osl: fix build by overriding llvm-as path
commit4d1c0ead245e30d72e5263b69f007c9992e0c9f2
authorRyan Burns <52847440+r-burns@users.noreply.github.com>
dateFri 24 Sep 2021, 09:28 (5 years ago)
parentd02205633a6220
pkgs/development/compilers/osl/default.nix+9−1
@@ -17,7 +17,15 @@ in clangStdenv.mkDerivation rec {
1717 sha256 = "1dwf10f2fpxc55pymwkapql20nc462mq61hv21c527994c2qp1ll";
1818 };
1919
20− cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ];
20+ cmakeFlags = [
21+ "-DUSE_BOOST_WAVE=ON"
22+ "-DENABLERTTI=ON"
23+
24+ # Build system implies llvm-config and llvm-as are in the same directory.
25+ # Override defaults.
26+ "-DLLVM_DIRECTORY=${llvm}"
27+ "-DLLVM_CONFIG=${llvm.dev}/bin/llvm-config"
28+ ];
2129
2230 preConfigure = "patchShebangs src/liboslexec/serialize-bc.bash ";
2331