summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2018-04-17 22:59:53 +0000
committer Eric Hameleers <alien@slackware.com>2018-04-17 22:59:53 +0000
commitf162ca2278cbaf14a058fb5f888a35063e03b4cf (patch)
tree1ee2e9120d1f33c36fd867431106aeec4e4220e6
parent06218a9f74581196985334db73ad519f88da22c1 (diff)
downloadmultilib-f162ca2278cbaf14a058fb5f888a35063e03b4cf.tar.gz
multilib-f162ca2278cbaf14a058fb5f888a35063e03b4cf.tar.xz
gcc-multilib: small tweaks, still trying to get it to build
-rwxr-xr-xsource/current/gcc/gcc-multilib.SlackBuild9
1 files changed, 5 insertions, 4 deletions
diff --git a/source/current/gcc/gcc-multilib.SlackBuild b/source/current/gcc/gcc-multilib.SlackBuild
index 3599086..b91246f 100755
--- a/source/current/gcc/gcc-multilib.SlackBuild
+++ b/source/current/gcc/gcc-multilib.SlackBuild
@@ -64,7 +64,7 @@ VERSION=${VERSION:-7.3.0}
BUILD=${BUILD:-2alien}
# How many jobs to run in parallel:
-NUMJOBS=" -j 7 "
+NUMJOBS=${NUMJOBS:-" -j7 "}
# What do we want to build
LANGS=${LANGS:-'ada,brig,c,c++,fortran,go,lto,objc'}
@@ -345,7 +345,7 @@ tar xf $CWD/gcc-$VERSION.tar.xz || exit 1
# The first run of the script, we can not build ada compiler because that
# requires gnat;
# First run: use
- # LANGS="all" to just build brig,c,c++,fortran,lto,objc
+ # LANGS="all" to just build c,c++,fortran,lto,objc
# Second run: use
# LANGS="ada,brig,c,c++,fortran,go,lto,objc"
@@ -382,6 +382,7 @@ tar xf $CWD/gcc-$VERSION.tar.xz || exit 1
--with-arch-directory=$LIB_ARCH \
--disable-gtktest \
--disable-werror \
+ --without-isl \
$GCC_ARCHOPTS \
--target=${TARGET} \
--build=${TARGET} \
@@ -684,11 +685,11 @@ echo $LANGS | grep -qwE '(all|objc)' && \
( cd $PKG6
makepkg -l y -c n $TMP/gcc-objc-${VERSION}_multilib-$ARCH-$BUILD.txz )
-echo $LANGS | grep -qwE '(all|go)' && \
+echo $LANGS | grep -qw go && \
( cd $PKG8
makepkg -l y -c n $TMP/gcc-go-${VERSION}_multilib-$ARCH-$BUILD.txz )
-echo $LANGS | grep -qwE '(all|brig)' && \
+echo $LANGS | grep -qw brig && \
( cd $PKG9
makepkg -l y -c n $TMP/gcc-brig-${VERSION}_multilib-$ARCH-$BUILD.txz )