build with GCC 7, install to /usr/

2 files changed, 14 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5969472a60ce..1f39ec94520b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = rust-mrustc
-	pkgdesc = Rust built with mrustc (does not work yet)
+	pkgdesc = Rust built with mrustc
 	pkgver = 1.19.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/thepowersgang/mrustc
 	arch = x86_64
 	license = MIT
+	makedepends = gcc7
 	depends = mrustc-git
 	provides = rust=1.19.0
 	source = https://static.rust-lang.org/dist/rustc-1.19.0-src.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index bb326a1f6e77..8d3acdda4bb7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,13 @@
 
 pkgname=rust-mrustc
 pkgver=1.19.0
-pkgrel=2
-pkgdesc='Rust built with mrustc (does not work yet)'
+pkgrel=3
+pkgdesc='Rust built with mrustc'
 arch=('x86_64')
 url='https://github.com/thepowersgang/mrustc'
 license=('MIT')
 depends=('mrustc-git')
-makedepends=()
+makedepends=('gcc7')
 provides=("rust=$pkgver")
 conflicts=()
 source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz" 'openssl.patch')
@@ -16,6 +16,12 @@ sha256sums=('15231f5053fb72ad82be91f5abfd6aa60cb7898c5089e4f1ac5910a731090c51'
 	'44d51a440ec2a0a052a64088fcbc95ccf6af62ea73feb76cc7269e2d0ff8f206')
 
 build() {
+	export CC=gcc-7
+	export CXX=g++-7
+	install -d "$srcdir/bin"
+	ln -s /usr/bin/x86_64-pc-linux-gnu-gcc-7 "$srcdir/bin/x86_64-pc-linux-gnu-gcc"
+	export PATH="$srcdir/bin:$PATH"
+
 	WORK="$srcdir/rust-mrustc"
 	mkdir -p "$WORK"
 	mv "$srcdir/rustc-$pkgver-src" "$WORK"
@@ -39,5 +45,6 @@ build() {
 }
 
 package() {
-	cp -r "$srcdir/rust-mrustc/run_rustc/prefix/"{bin,lib} "$pkgdir/"
+	install -d "$pkgdir/usr"
+	cp -r "$srcdir/rust-mrustc/run_rustc/prefix/"{bin,lib} "$pkgdir/usr/"
 }