diff options
| author | SR_team | 2021-12-20 05:24:02 +0300 |
|---|---|---|
| committer | SR_team | 2021-12-20 05:29:28 +0300 |
| commit | 3961a64f2869d71d14ed0730ed06bed83355e2fe (patch) | |
| tree | 68c64fca11026f56df1395dcc0d699e9c3aad34d | |
| parent | d0b7a1eb7f4355df69e28ee0e76b6a11607ed1c9 (diff) | |
| download | aur-3961a64f2869d71d14ed0730ed06bed83355e2fe.tar.gz | |
Do not add toolchain fail for `--build` (Thanks MXE project)
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rwxr-xr-x | msvc-cmake.sh | 13 |
3 files changed, 12 insertions, 7 deletions
@@ -1,7 +1,7 @@ pkgbase = msvc-wine-git pkgdesc = MSVC compiler with CMake toolchains. Compiler work in Wine64 pkgver = 16.11.7 - pkgrel = 4 + pkgrel = 5 url = https://github.com/mstorsjo/msvc-wine arch = x86_64 license = EULA @@ -1,6 +1,6 @@ pkgname=msvc-wine-git pkgver=16.11.7 -pkgrel=4 +pkgrel=5 pkgdesc='MSVC compiler with CMake toolchains. Compiler work in Wine64' arch=('x86_64') url='https://github.com/mstorsjo/msvc-wine' @@ -13,7 +13,7 @@ source=('git+https://github.com/mstorsjo/msvc-wine.git' 'msvc-cmake.sh' 'toolchain-msvc.cmake') sha256sums=('SKIP' - '8629fdbc948fa42640ac93388316b776e9c51e9cd5ff05be9506e96547b98e59' + 'f6e7660c2ecf32fedd16dbe7a8765ce902bdad21d7329fa57870b979ad682dd7' '52efc3ad1f5575f35cf9319ade41a23ace667156bdc5f66e4e32527bc8b64c5d') options=('!strip' 'libtool' 'staticlibs' 'emptydirs') diff --git a/msvc-cmake.sh b/msvc-cmake.sh index 32b607eeac34..ee948c356465 100755 --- a/msvc-cmake.sh +++ b/msvc-cmake.sh @@ -1,6 +1,11 @@ #!/bin/sh -cmake \ - -DCMAKE_TOOLCHAIN_FILE=/opt/msvc/cmake/toolchain-@PROCESSOR@.cmake \ - -DCMAKE_CROSSCOMPILING_EMULATOR=/usr/bin/wine \ - "$@" +if echo -- "$@" | grep -Ewq "(--build|--install|-E|--system-information)" ; then + cmake "$@" +else + cmake \ + -DCMAKE_TOOLCHAIN_FILE=/opt/msvc/cmake/toolchain-@PROCESSOR@.cmake \ + -DCMAKE_CROSSCOMPILING_EMULATOR=/usr/bin/wine \ + "$@" +fi + |