Merge branch 'rinderknecht@gcc' into 'dev'
Forgot to remove gcc as a dependency so the docker image is smaller. See merge request ligolang/ligo!567
This commit is contained in:
commit
7b5acbcef0
@ -5,16 +5,16 @@ set -e
|
|||||||
|
|
||||||
if [ -n "`which opam`" ]
|
if [ -n "`which opam`" ]
|
||||||
then
|
then
|
||||||
if [ -n "`opam --version | grep -P "2\..\.."`" ]
|
if [ -n "`opam --version | grep -P "2\..\.."`" ]
|
||||||
then
|
then
|
||||||
echo "Opam 2.x seems to already exist, exiting..."
|
echo "Opam 2.x seems to already exist, exiting..."
|
||||||
exit 1
|
exit 1
|
||||||
else
|
else
|
||||||
read -p "This script will upgrade opam to the 2.x series, are you okay with that? (y/n)" choice1
|
read -p "This script will upgrade opam to the 2.x series, are you okay with that? (y/n)" choice1
|
||||||
case "$choice1" in
|
case "$choice1" in
|
||||||
y|Y ) : ;;
|
y|Y ) : ;;
|
||||||
n|N ) exit ;;
|
n|N ) exit ;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -25,7 +25,6 @@ then
|
|||||||
rakudo \
|
rakudo \
|
||||||
make \
|
make \
|
||||||
m4 \
|
m4 \
|
||||||
gcc \
|
|
||||||
patch \
|
patch \
|
||||||
bubblewrap \
|
bubblewrap \
|
||||||
rsync \
|
rsync \
|
||||||
@ -38,7 +37,6 @@ sudo apt-get install -y make \
|
|||||||
perl6 \
|
perl6 \
|
||||||
make \
|
make \
|
||||||
m4 \
|
m4 \
|
||||||
gcc \
|
|
||||||
patch \
|
patch \
|
||||||
bubblewrap \
|
bubblewrap \
|
||||||
rsync \
|
rsync \
|
||||||
@ -87,10 +85,8 @@ else
|
|||||||
echo "(If you actually get this message, you should probably file an issue)"
|
echo "(If you actually get this message, you should probably file an issue)"
|
||||||
echo "https://gitlab.com/ligolang/ligo/issues"
|
echo "https://gitlab.com/ligolang/ligo/issues"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
opam init -a --bare
|
opam init -a --bare
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user