Merge pull request #138454 from trofi/fix-osl

osl: fix build by overriding llvm-as path
This commit is contained in:
Ryan Burns 2021-09-24 09:28:14 -07:00 committed by GitHub
commit 4d1c0ead24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -17,7 +17,15 @@ in clangStdenv.mkDerivation rec {
sha256 = "1dwf10f2fpxc55pymwkapql20nc462mq61hv21c527994c2qp1ll";
};
cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ];
cmakeFlags = [
"-DUSE_BOOST_WAVE=ON"
"-DENABLERTTI=ON"
# Build system implies llvm-config and llvm-as are in the same directory.
# Override defaults.
"-DLLVM_DIRECTORY=${llvm}"
"-DLLVM_CONFIG=${llvm.dev}/bin/llvm-config"
];
preConfigure = "patchShebangs src/liboslexec/serialize-bc.bash ";