From 54d3863f4487caf692625d6d85d083f03915b05a Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 18 Jan 2020 10:16:11 +0100
Subject: 20200118.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 audio/alsamodularsynth/alsamodularsynth.SlackBuild | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'audio/alsamodularsynth')

diff --git a/audio/alsamodularsynth/alsamodularsynth.SlackBuild b/audio/alsamodularsynth/alsamodularsynth.SlackBuild
index 60c79fccb5..088d4c44dd 100644
--- a/audio/alsamodularsynth/alsamodularsynth.SlackBuild
+++ b/audio/alsamodularsynth/alsamodularsynth.SlackBuild
@@ -31,7 +31,7 @@ TARNAM=ams
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -72,6 +72,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+export CC=clang
+export CXX=clang++
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LIBS="-ldl" \
-- 
cgit v1.2.3