Merge pull request #111487 from Ericson2314/llvm-outputs-and-cross-compile-tools

llvmPackages: Clean up outputs
This commit is contained in:
John Ericson
2021-04-30 11:28:08 -04:00
committed by GitHub
210 changed files with 10414 additions and 660 deletions
+1 -1
View File
@@ -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=";
+1 -1
View File
@@ -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";