mirror of
https://git.asonix.dog/asonix/pict-rs
synced 2024-11-20 11:21:14 +00:00
remove protobuf, simplify CC variables
This commit is contained in:
parent
01ad4c7453
commit
ca3f34cdac
1 changed files with 2 additions and 4 deletions
|
@ -40,8 +40,6 @@
|
||||||
|
|
||||||
cargoTarget = nixpkgs.lib.strings.concatMapStringsSep "_" (nixpkgs.lib.strings.toUpper) systemMappings.${crossSystem};
|
cargoTarget = nixpkgs.lib.strings.concatMapStringsSep "_" (nixpkgs.lib.strings.toUpper) systemMappings.${crossSystem};
|
||||||
|
|
||||||
ccTarget = nixpkgs.lib.strings.concatStringsSep "_" systemMappings.${crossSystem};
|
|
||||||
|
|
||||||
toolchain = with fenix.packages.${system}; combine [
|
toolchain = with fenix.packages.${system}; combine [
|
||||||
minimal.cargo
|
minimal.cargo
|
||||||
minimal.rustc
|
minimal.rustc
|
||||||
|
@ -58,8 +56,8 @@
|
||||||
|
|
||||||
CARGO_BUILD_TARGET = target;
|
CARGO_BUILD_TARGET = target;
|
||||||
"CARGO_TARGET_${cargoTarget}_LINKER" = "${cc}/bin/${cc.targetPrefix}cc";
|
"CARGO_TARGET_${cargoTarget}_LINKER" = "${cc}/bin/${cc.targetPrefix}cc";
|
||||||
"CC_${ccTarget}" = "${cc}/bin/${cc.targetPrefix}cc";
|
TARGET_CC = "${cc}/bin/${cc.targetPrefix}cc";
|
||||||
"AR_${ccTarget}" = "${cc}/bin/${cc.targetPrefix}ar";
|
TARGET_AR = "${cc}/bin/${cc.targetPrefix}ar";
|
||||||
});
|
});
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue