M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

flake: get rid of TARGET_AR

This commit is contained in:
Sebastien Bourdeauducq 2021-12-05 14:31:49 +08:00
parent 4a6bea479a
commit 12512bfb2f
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock
View File

@ -61,11 +61,11 @@
"src-misoc": { "src-misoc": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1636527305, "lastModified": 1638683371,
"narHash": "sha256-/2XTejqj0Bo81HaTrlTSWwInnWwsuqnq+CURXbpIrkA=", "narHash": "sha256-sm2SxHmEGfE56+V+joDHMjpOaxg8+t3EJEk1d11C1E0=",
"ref": "master", "ref": "master",
"rev": "f5203e406520874e15ab5d070058ef642fc57fd9", "rev": "71b74f87b41c56a6c6d767cdfde0356c15a379a7",
"revCount": 2417, "revCount": 2418,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/m-labs/misoc.git" "url": "https://github.com/m-labs/misoc.git"

2
flake.nix
View File

@ -270,7 +270,6 @@
ln -s $ARTIQ_PATH/firmware/Cargo.lock . ln -s $ARTIQ_PATH/firmware/Cargo.lock .
cargoSetupPostUnpackHook cargoSetupPostUnpackHook
cargoSetupPostPatchHook cargoSetupPostPatchHook
export TARGET_AR=llvm-ar
${buildCommand} ${buildCommand}
''; '';
doCheck = true; doCheck = true;
@ -384,7 +383,6 @@
packages.x86_64-linux.vivado packages.x86_64-linux.vivado
packages.x86_64-linux.openocd-bscanspi packages.x86_64-linux.openocd-bscanspi
]; ];
TARGET_AR="llvm-ar";
}; };
hydraJobs = { hydraJobs = {