mwojcik
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

conda-windows: fix binutils target handling

This commit is contained in:
Sebastien Bourdeauducq 2020-06-16 12:52:42 +08:00
parent d75e222bfc
commit f464b61290
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq-fast/conda-windows/binutils.nix
View File

@ -41,7 +41,7 @@ let
set LDFLAGS=-L%PREFIX:\=/%/Library/lib/ set LDFLAGS=-L%PREFIX:\=/%/Library/lib/
sh ../configure --build=%TRIPLE% ^ sh ../configure --build=%TRIPLE% ^
--prefix="%PREFIX:\=/%/Library" ^ --prefix="%PREFIX:\=/%/Library" ^
--target=or1k-linux --target=${target}
if errorlevel 1 exit 1 if errorlevel 1 exit 1
make -j4 make -j4
@ -51,7 +51,7 @@ let
if errorlevel 1 exit 1 if errorlevel 1 exit 1
rem this is a copy of prefixed executables rem this is a copy of prefixed executables
rmdir /S /Q %PREFIX%\Library\or1k-linux rmdir /S /Q %PREFIX%\Library\${target}
EOF EOF
${wfvm.utils.win-exec}/bin/win-exec "mkdir binutils" ${wfvm.utils.win-exec}/bin/win-exec "mkdir binutils"

2
artiq-fast/wfvm/demo-image.nix
View File

@ -37,7 +37,7 @@ wfvm.makeWindowsImage {
# administratorPassword = "12345"; # administratorPassword = "12345";
# Imperative installation commands, to be installed incrementally # Imperative installation commands, to be installed incrementally
installCommands = with wfvm.layers; [ anaconda3 msys2 msys2-packages ]; installCommands = with wfvm.layers; [ anaconda3 ];
# services = { # services = {
# # Enable remote management # # Enable remote management