diff --git a/cataclysm-dda/riscv64.patch b/cataclysm-dda/riscv64.patch
index cf86b89f1..da7e6ba52 100644
--- a/cataclysm-dda/riscv64.patch
+++ b/cataclysm-dda/riscv64.patch
@@ -1,33 +1,10 @@
-diff --git PKGBUILD PKGBUILD
-index a198c8b..c7dd064 100644
 --- PKGBUILD
 +++ PKGBUILD
-@@ -33,8 +33,8 @@ build() {
+@@ -32,6 +32,7 @@ build() {
+   export CXXFLAGS="${CXXFLAGS/-Wp,-D_GLIBCXX_ASSERTIONS}"
    export CXXFLAGS="${CXXFLAGS/-fcf-protection}"
    export CXXFLAGS="${CXXFLAGS/-fstack-clash-protection}"
++  export GOLD=0
  
--  make PREFIX=/usr PCH=0 RELEASE=1 USE_XDG_DIR=1 LTO=1 RUNTESTS=0 LOCALIZE=1 LANGUAGES=all BACKTRACE=1 LIBBACKTRACE=1
--  make PREFIX=/usr PCH=0 RELEASE=1 USE_XDG_DIR=1 LTO=1 RUNTESTS=0 LOCALIZE=1 LANGUAGES=all BACKTRACE=1 LIBBACKTRACE=1 TILES=1 SOUND=1
-+  make PREFIX=/usr PCH=0 RELEASE=1 USE_XDG_DIR=1 LTO=1 GOLD=0 RUNTESTS=0 LOCALIZE=1 LANGUAGES=all BACKTRACE=1 LIBBACKTRACE=1
-+  make PREFIX=/usr PCH=0 RELEASE=1 USE_XDG_DIR=1 LTO=1 GOLD=0 RUNTESTS=0 LOCALIZE=1 LANGUAGES=all BACKTRACE=1 LIBBACKTRACE=1 TILES=1 SOUND=1
-   # TODO: Do we want this?
-   # make PREFIX=/usr object_creator
-   ./lang/compile_mo.sh
-@@ -43,7 +43,7 @@ build() {
- package_cataclysm-dda() {
-   cd "Cataclysm-DDA-$_pkgver"
- 
--  make DESTDIR="$pkgdir" PREFIX=/usr PCH=0 RELEASE=1 USE_XDG_DIR=1 LTO=1 RUNTESTS=0 LOCALIZE=1 LANGUAGES=all install
-+  make DESTDIR="$pkgdir" PREFIX=/usr PCH=0 RELEASE=1 USE_XDG_DIR=1 LTO=1 GOLD=0 RUNTESTS=0 LOCALIZE=1 LANGUAGES=all install
- 
-   # Docs
-   install -d "$pkgdir/usr/share/doc/cataclysm-dda"
-@@ -76,7 +76,7 @@ package_cataclysm-dda-tiles() {
-   depends=('cataclysm-dda' 'sdl2_image' 'sdl2_ttf' 'freetype2' 'sdl2_mixer')
-   cd "Cataclysm-DDA-$_pkgver"
- 
--  make DESTDIR="$pkgdir" PREFIX=/usr PCH=0 RELEASE=1 USE_XDG_DIR=1 LTO=1 LOCALIZE=1 LANGUAGES=all TILES=1 SOUND=1 install
-+  make DESTDIR="$pkgdir" PREFIX=/usr PCH=0 RELEASE=1 USE_XDG_DIR=1 LTO=1 GOLD=0 LOCALIZE=1 LANGUAGES=all TILES=1 SOUND=1 install
- 
-   # Icons
-   cd build-data/osx/AppIcon.iconset
+   make PREFIX=/usr PCH=0 RELEASE=1 USE_XDG_DIR=1 LTO=1 RUNTESTS=0 TESTS=0 LOCALIZE=1 LANGUAGES=all BACKTRACE=1 LIBBACKTRACE=1
+   make PREFIX=/usr PCH=0 RELEASE=1 USE_XDG_DIR=1 LTO=1 RUNTESTS=0 TESTS=0 LOCALIZE=1 LANGUAGES=all BACKTRACE=1 LIBBACKTRACE=1 TILES=1 SOUND=1