summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:07:10 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:07:10 -0400
commit700ba42dabce708dc9138500d60e2b57724c6c98 (patch)
treea9e413048ba59e6778c323aad22b210fcb2e6e2a
parentd83e2f6148a14e74bf283e40fbc80f486809db2e (diff)
downloadslackbuilds-700ba42dabce708dc9138500d60e2b57724c6c98.tar.gz
libraries/haskell-stm: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/haskell-stm/haskell-stm.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/haskell-stm/haskell-stm.SlackBuild b/libraries/haskell-stm/haskell-stm.SlackBuild
index fbda2714fa..e02937308d 100644
--- a/libraries/haskell-stm/haskell-stm.SlackBuild
+++ b/libraries/haskell-stm/haskell-stm.SlackBuild
@@ -7,13 +7,22 @@
PRGNAM=haskell-stm
VERSION=${VERSION:-2.1.1.2}
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
TARNAM=stm
GHC_VERSION=$(ghc-pkg field ghc version | cut -d' ' -f2)
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -28,6 +37,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e