diff options
| author | Jan Niklas Hasse <jhasse@bixense.com> | 2019-08-28 10:36:29 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-28 10:36:29 (GMT) |
| commit | 85c2d65636a80b1a8b78da60132c865601a18abb (patch) | |
| tree | b5e7aed80d8636652f32b434b3f97662e6bc71be | |
| parent | ae3130c9bc25079b4b51a92c6c784673c82fc0cd (diff) | |
| parent | 21eb8669ff576aa0d26159845c22f65227c1cc30 (diff) | |
| download | Ninja-85c2d65636a80b1a8b78da60132c865601a18abb.zip Ninja-85c2d65636a80b1a8b78da60132c865601a18abb.tar.gz Ninja-85c2d65636a80b1a8b78da60132c865601a18abb.tar.bz2 | |
Merge pull request #1634 from ColinFinck/fix-mingw
Fix MinGW bootstrap build.
| -rw-r--r-- | appveyor.yml | 1 | ||||
| -rwxr-xr-x | configure.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/appveyor.yml b/appveyor.yml index 02399fa..f0b92b8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,7 +28,6 @@ for: build_script: ps: "C:\\msys64\\usr\\bin\\bash -lc @\"\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 ./ninja all\n ./ninja_test 2>&1\n diff --git a/configure.py b/configure.py index 529c0e9..1d6ee7d 100755 --- a/configure.py +++ b/configure.py @@ -437,7 +437,7 @@ if host.is_msvc(): description='LIB $out') elif host.is_mingw(): n.rule('ar', - command='cmd /c $ar cqs $out.tmp $in && move /Y $out.tmp $out', + command='$ar crs $out $in', description='AR $out') else: n.rule('ar', |