Click here to go back to the commit logs for prismlauncher-git.

Commit:

---

Hash: 828f8e4f8af3413b244695db13b70e566c407faf

Message: cf-protection is actually x86-64 only Signed-off-by: lordpipe <lordpipe@protonmail.com>

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index 3fb5bbf..cba82dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,7 +2,7 @@ generated-by = makedeb
 pkgname = prismlauncher-git
 pkgbase = prismlauncher-git
 pkgdesc = Minecraft launcher with ability to manage multiple instances.
-pkgrel = 1
+pkgrel = 2
 pkgver = 8.0.r1.bdec11c
 url = https://github.com/PrismLauncher/PrismLauncher
 arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index eac57a0..8407236 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 _pkgname=prismlauncher
 pkgname=${_pkgname}-git
 pkgver=8.0.r1.bdec11c
-pkgrel=1
+pkgrel=2
 pkgdesc="Minecraft launcher with ability to manage multiple instances."
 arch=('i686' 'amd64' 'arm64' 'armhf' 'riscv64')
 url="https://github.com/PrismLauncher/PrismLauncher"
@@ -29,13 +29,15 @@ CFLAGS=${CFLAGS/-march=x86-64/}
 CXXFLAGS=${CXXFLAGS/-march=x86-64/}
 CFLAGS=${CFLAGS/-mtune=generic/}
 CXXFLAGS=${CXXFLAGS/-mtune=generic/}
+CFLAGS=${CFLAGS/-fcf-protection/}
+CXXFLAGS=${CXXFLAGS/-fcf-protection/}
 
 # if the user hasn't specified a tuning/architecture, specify our own minimal defaults to cover the earliest CPUs
 if [[ ${CFLAGS} != *"-mtune"* && ${CFLAGS} != *"-march"* ]]; then
   case $(uname -m) in
     x86_64)
-      CFLAGS+=" -march=x86-64 -mtune=generic"
-      CXXFLAGS+=" -march=x86-64 -mtune=generic"
+      CFLAGS+=" -march=x86-64 -mtune=generic -fcf-protection"
+      CXXFLAGS+=" -march=x86-64 -mtune=generic -fcf-protection"
       ;;
     aarch64*|armv8*|armv9*|arm64*)
       CFLAGS+=" -march=armv8-a -mtune=generic"
@@ -48,8 +50,6 @@ if [[ ${CFLAGS} != *"-mtune"* && ${CFLAGS} != *"-march"* ]]; then
     riscv64*)
       CFLAGS+=" -march=rv64imafdc"
       CXXFLAGS+=" -march=rv64imafdc"
-      CFLAGS=${CFLAGS/-fcf-protection/}
-      CXXFLAGS=${CXXFLAGS/-fcf-protection/}
       ;;
   esac
 fi