Browse Source

Make compiler version explicit in install scripts names. ulib depends on gcc-4.9.

Matthieu Garrigues 9 years ago
parent
commit
553e63e933

+ 1 - 1
toolset/setup/linux/frameworks/silicon.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends clang
+fw_depends clang-3.8
 
 RETCODE=$(fw_exists ${IROOT}/silicon.installed)
 [ ! "$RETCODE" == 0 ] || { \

+ 2 - 0
toolset/setup/linux/frameworks/ulib.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+fw_depends gcc-4.9
+
 RETCODE=$(fw_exists ${IROOT}/ulib.installed)
 [ ! "$RETCODE" == 0 ] || { \
   source $IROOT/ulib.installed

+ 3 - 3
toolset/setup/linux/systools/clang.sh → toolset/setup/linux/systools/clang-3.8.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
 
-RETCODE=$(fw_exists ${IROOT}/clang.installed)
+RETCODE=$(fw_exists ${IROOT}/clang-3.8.installed)
 [ ! "$RETCODE" == 0 ] || { \
-  source $IROOT/clang.installed
+  source $IROOT/clang-3.8.installed
   return 0; }
 
 sudo add-apt-repository -s "deb http://apt.llvm.org/`lsb_release -cs`/ llvm-toolchain-`lsb_release -cs`-3.8 main"
@@ -11,4 +11,4 @@ wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
 sudo apt-get -yq update
 sudo apt-get install -qqy clang-3.8
 
-touch $IROOT/clang.installed
+touch $IROOT/clang-3.8.installed

+ 13 - 0
toolset/setup/linux/systools/gcc-4.9.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+
+RETCODE=$(fw_exists ${IROOT}/gcc-4.9.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  source $IROOT/gcc-4.9.installed
+  return 0; }
+
+sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+sudo apt-get -yq update
+sudo apt-get install -qqy gcc-4.9 g++-4.9
+
+touch $IROOT/gcc-4.9.installed