reactos/ninja
1
0
Fork 0
mirror of https://github.com/reactos/ninja.git synced 2024-11-26 21:20:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix MinGW bootstrap build by applying the fix in appveyor.yml permanently.

Browse Source
This commit is contained in:
Colin Finck 2019-08-26 18:49:47 +02:00
parent 0dfa8a48eb
commit 21eb8669ff
No known key found for this signature in database
GPG Key ID: 1BA74E70456BA1A9
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
appveyor.yml
View File

@ -28,7 +28,6 @@ for:
build_script: build_script:
ps: "C:\\msys64\\usr\\bin\\bash -lc @\"\n ps: "C:\\msys64\\usr\\bin\\bash -lc @\"\n
pacman -S --quiet --noconfirm --needed re2c 2>&1\n pacman -S --quiet --noconfirm --needed re2c 2>&1\n
sed -i 's|cmd /c `$ar cqs `$out.tmp `$in \\&\\& move /Y `$out.tmp `$out|`$ar crs `$out `$in|g' configure.py\n
./configure.py --bootstrap --platform mingw 2>&1\n ./configure.py --bootstrap --platform mingw 2>&1\n
./ninja all\n ./ninja all\n
./ninja_test 2>&1\n ./ninja_test 2>&1\n

2
configure.py
View File

@ -437,7 +437,7 @@ if host.is_msvc():
description='LIB $out') description='LIB $out')
elif host.is_mingw(): elif host.is_mingw():
n.rule('ar', n.rule('ar',
command='cmd /c $ar cqs $out.tmp $in && move /Y $out.tmp $out', command='$ar crs $out $in',
description='AR $out') description='AR $out')
else: else:
n.rule('ar', n.rule('ar',