xash3d-hlsdk: x86_64 is not ready: revert to multilib config

2 files changed, 11 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cfa0f0cc104b..ca57f7ff03f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,9 +9,12 @@ pkgbase = xash3d-hlsdk
 	makedepends = make
 	makedepends = binutils
 	makedepends = cmake
-	makedepends = gcc
 	source = xash3d-hlsdk::git+https://github.com/FWGS/hlsdk-xash3d
 	md5sums = SKIP
+	makedepends_i686 = gcc
+	makedepends_i686 = gcc-libs
+	makedepends_x86_64 = gcc-multilib
+	makedepends_x86_64 = lib32-gcc-libs
 
 pkgname = xash3d-hlsdk
 
diff --git a/PKGBUILD b/PKGBUILD
index 1ea694f739e9..bfa26856c16b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,15 +7,18 @@ pkgdesc="Half-Life SDK from original Xash3D engine"
 arch=('i686' 'x86_64')
 url="http://xash.su/"
 license=('GPL3')
-makedepends=('make' 'binutils' 'cmake' 'gcc')
+makedepends=('make' 'binutils' 'cmake')
+makedepends_i686=('gcc' 'gcc-libs')
+makedepends_x86_64=('gcc-multilib' 'lib32-gcc-libs')
 source=("$pkgname::git+https://github.com/FWGS/hlsdk-xash3d")
 
-_args="--libdir=/usr/lib \
---enable-goldsrc-support \
+_args="--enable-goldsrc-support \
 --build-type=release"
 
 if [ $CARCH == "x86_64" ]; then
-    _args+=" -8"
+    _args+=" --libdir=/usr/lib32"
+else
+    _args+=" --libdir=/usr/lib"
 fi
 
 pkgver() {