summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorpingplug2018-02-14 22:12:09 +0800
committerpingplug2018-02-14 22:12:09 +0800
commitbbe0efe2a3b236604b8fce8394a6a18a1e7b38ff (patch)
treefb573022c2bc2d9c3fe1585262e4e2a98f1b50ed
parente3263991485a9ff185048b4a4cac29e79327b3d5 (diff)
downloadaur-bbe0efe2a3b236604b8fce8394a6a18a1e7b38ff.tar.gz
fix cargo/config
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD19
2 files changed, 17 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 192842eb285..261bff131d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mingw-w64-rust
pkgdesc = rust language prebuilt toolchain with mingw target (mingw-w64)
pkgver = 1.23.0
- pkgrel = 1
+ pkgrel = 2
url = https://www.rust-lang.org/
arch = any
license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index 3f9eab263f3..2e00ef599e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
pkgname=mingw-w64-rust
_pkgname=rust
pkgver=1.23.0
-pkgrel=1
+pkgrel=2
pkgdesc="rust language prebuilt toolchain with mingw target (mingw-w64)"
arch=('any')
url='https://www.rust-lang.org/'
@@ -98,9 +98,15 @@ EOF
runner = "wine"
EOF
fi
-
cat << EOF >> "${pkgdir}/opt/${_pkgname}/cargo/config"
+rustflags = [
+EOF
+ cat << EOF >> "${pkgdir}/opt/${_pkgname}/cargo/config"
+ ]
+EOF
+
+ cat << EOF >> "${pkgdir}/opt/${_pkgname}/cargo/config"
[target.x86_64-pc-windows-gnu]
linker = "/usr/bin/x86_64-w64-mingw32-gcc"
ar = "/usr/x86_64-w64-mingw32/bin/ar"
@@ -110,11 +116,18 @@ EOF
runner = "wine"
EOF
fi
+ cat << EOF >> "${pkgdir}/opt/${_pkgname}/cargo/config"
+rustflags = [
+EOF
if pacman -T "mingw-w64-crt>5.0.3.20171219" ; then
cat << EOF >> "${pkgdir}/opt/${_pkgname}/cargo/config"
-rustflags = ["-C", "link-arg=-lmsvcrt"]
+ "-C", "link-arg=-lmsvcrt",
EOF
fi
+ cat << EOF >> "${pkgdir}/opt/${_pkgname}/cargo/config"
+ ]
+
+EOF
}
# vim:set ts=2 sw=2 et: