From 7347c46de5f14b34753cfb362e3f2f67c3512bc1 Mon Sep 17 00:00:00 2001
From: Amir Mohammadi <183.amir@gmail.com>
Date: Fri, 10 Feb 2017 14:21:42 +0100
Subject: [PATCH] Use toolchain 2.3.0, dont install gcc on mac
---
install/from-scratch.sh | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/install/from-scratch.sh b/install/from-scratch.sh
index a37288e..c82833f 100755
--- a/install/from-scratch.sh
+++ b/install/from-scratch.sh
@@ -34,6 +34,14 @@ else
TENSORFLOW=
fi
+if [ "$(uname)" == "Linux" ]; then
+ MYGCCPACKAGE="gcc=4.8.5"
+ MYLIBGCCPKG="libgcc=4.8.5"
+else
+ MYGCCPACKAGE=
+ MYLIBGCCPKG=
+fi
+
# For a complete list of dependencies, please read:
# https://gitlab.idiap.ch/bob/bob/wikis/Dependencies
@@ -75,8 +83,8 @@ ${CONDA} create --copy --yes -n ${NAME} \
cyvlfeat=0.4.5 \
docopt \
ffmpeg=2.8.10 \
- gcc=4.8.5 \
- libgcc=4.8.5 \
+ ${MYGCCPACKAGE} \
+ ${MYLIBGCCPKG} \
giflib=5.1.4 \
ipdb=0.10.2 \
ipython \
@@ -97,7 +105,7 @@ ${CONDA} create --copy --yes -n ${NAME} \
sox=14.4.2 \
sphinx_rtd_theme \
${TENSORFLOW} \
- toolchain=2.1.0 \
+ toolchain=2.3.0 \
vlfeat=0.9.20
echo "[>>] Bye!"
--
GitLab