From f6f37692f0f6f5ac758ff5cb0849d687c41c7f38 Mon Sep 17 00:00:00 2001 From: "John H. Robinson, IV" Date: Mon, 12 Oct 2015 16:54:59 -0700 Subject: [PATCH] Use update-alternatives for clang++ --- vagrant.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vagrant.sh b/vagrant.sh index 388ea2f..6793084 100755 --- a/vagrant.sh +++ b/vagrant.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # http://askubuntu.com/a/497033 sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y @@ -20,8 +20,9 @@ packages="$packages clang-3.6++" sudo apt-get install -y $packages # Why doesn't clang do this for us? -[ ! -e /usr/bin/clang++ ] && sudo ln -s /usr/bin/clang++-3.6 /usr/bin/clang++ +sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-3.6 10 +sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.6 10 # Build it! cd /vagrant/premake -/bin/bash gmake.sh && { cd gmake; make; } +./gmake.sh && { cd gmake; make; }