Merge pull request #111487 from Ericson2314/llvm-outputs-and-cross-compile-tools
llvmPackages: Clean up outputs
This commit is contained in:
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
|
||||
nativeBuildInputs = [ pkg-config clang ];
|
||||
|
||||
configurePhase = ''
|
||||
export LIBCLANG_PATH="${llvmPackages.libclang}/lib"
|
||||
export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-4VuM1bPkl9XCI9XsZIJvw3kHSKgT4P7x6I83F2KCFD0=";
|
||||
|
||||
@@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec {
|
||||
"build-release"
|
||||
];
|
||||
|
||||
LIBCLANG_PATH = "${llvmPackages_10.libclang}/lib";
|
||||
LIBCLANG_PATH = "${llvmPackages_10.libclang.lib}/lib";
|
||||
|
||||
# Sometimes, tests fail on CI (ofborg) & hydra without this
|
||||
CARGO_TEST_ARGS = "--workspace --exclude sequoia-store";
|
||||
|
||||
Reference in New Issue
Block a user