Skip to content
Snippets Groups Projects
Unverified Commit bbf63c38 authored by Julian Ospald's avatar Julian Ospald :tea:
Browse files

Merge remote-tracking branch 'origin/pr/70'

parents eb1dd745 ae263ac2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.download-urls
+ 8
− 1
View file @ bbf63c38
......@@ -18,6 +18,7 @@ ghc 8.0.2 i386 debian=7 https://downloads.haskell.or
ghc 8.0.2 x86_64 debian=8,debian,ubuntu,unknown https://downloads.haskell.org/~ghc/8.0.2/ghc-8.0.2-x86_64-deb8-linux.tar.xz
ghc 8.0.2 i386 debian=8,debian,ubuntu,unknown https://downloads.haskell.org/~ghc/8.0.2/ghc-8.0.2-i386-deb8-linux.tar.xz
ghc 8.0.2 x86_64 darwin https://downloads.haskell.org/~ghc/8.0.2/ghc-8.0.2-x86_64-apple-darwin.tar.xz
ghc 8.0.2 x86_64 freebsd=9,freebsd=10,freebsd=11 https://downloads.haskell.org/~ghc/8.0.2/ghc-8.0.2-x86_64-portbld-freebsd.tar.xz
ghc 8.2.2 x86_64 debian=7 https://downloads.haskell.org/~ghc/8.2.2/ghc-8.2.2-x86_64-deb7-linux.tar.xz
ghc 8.2.2 i386 debian=7 https://downloads.haskell.org/~ghc/8.2.2/ghc-8.2.2-i386-deb7-linux.tar.xz
......@@ -25,6 +26,8 @@ ghc 8.2.2 x86_64 debian=8,debian,ubuntu https://downloads.haskell.or
ghc 8.2.2 i386 debian=8,debian,ubuntu,unknown https://downloads.haskell.org/~ghc/8.2.2/ghc-8.2.2-i386-deb8-linux.tar.xz
ghc 8.2.2 x86_64 unknown https://downloads.haskell.org/~ghc/8.2.2/ghc-8.2.2-x86_64-unknown-linux.tar.xz
ghc 8.2.2 x86_64 darwin https://downloads.haskell.org/~ghc/8.2.2/ghc-8.2.2-x86_64-apple-darwin.tar.xz
ghc 8.2.2 x86_64 freebsd=10 https://downloads.haskell.org/~ghc/8.2.2/ghc-8.2.2-x86_64-portbld10_3-freebsd.tar.xz
ghc 8.2.2 x86_64 freebsd=11 https://downloads.haskell.org/~ghc/8.2.2/ghc-8.2.2-x86_64-portbld11-freebsd.tar.xz
ghc 8.4.3 i386 debian=8,debian,ubuntu,unknown https://downloads.haskell.org/~ghc/8.4.3/ghc-8.4.3-i386-deb8-linux.tar.xz
ghc 8.4.3 x86_64 debian=8 https://downloads.haskell.org/~ghc/8.4.3/ghc-8.4.3-x86_64-deb8-linux.tar.xz
......@@ -38,12 +41,14 @@ ghc 8.4.4 x86_64 debian=9,debian,ubuntu https://downloads.haskell.or
ghc 8.4.4 x86_64 centos=7,centos,amazonlinux https://downloads.haskell.org/~ghc/8.4.4/ghc-8.4.4-x86_64-centos70-linux.tar.xz
ghc 8.4.4 x86_64 fedora=27,fedora,unknown https://downloads.haskell.org/~ghc/8.4.4/ghc-8.4.4-x86_64-fedora27-linux.tar.xz
ghc 8.4.4 x86_64 darwin https://downloads.haskell.org/~ghc/8.4.4/ghc-8.4.4-x86_64-apple-darwin.tar.xz
ghc 8.4.4 x86_64 freebsd=11 https://downloads.haskell.org/~ghc/8.4.4/ghc-8.4.4-x86_64-portbld-freebsd11.tar.xz
ghc 8.6.1 i386 debian=8,debian,ubuntu,unknown https://downloads.haskell.org/~ghc/8.6.1/ghc-8.6.1-i386-deb8-linux.tar.xz
ghc 8.6.1 x86_64 debian=8 https://downloads.haskell.org/~ghc/8.6.1/ghc-8.6.1-x86_64-deb8-linux.tar.xz
ghc 8.6.1 x86_64 debian=9,debian,ubuntu https://downloads.haskell.org/~ghc/8.6.1/ghc-8.6.1-x86_64-deb9-linux.tar.xz
ghc 8.6.1 x86_64 fedora=27,fedora,unknown https://downloads.haskell.org/~ghc/8.6.1/ghc-8.6.1-x86_64-fedora27-linux.tar.xz
ghc 8.6.1 x86_64 darwin https://downloads.haskell.org/~ghc/8.6.1/ghc-8.6.1-x86_64-apple-darwin.tar.xz
ghc 8.6.1 x86_64 freebsd https://downloads.haskell.org/~ghc/8.6.1/ghc-8.6.1-x86_64-portbld-freebsd.tar.xz
ghc 8.6.2 i386 debian=8,debian,ubuntu,unknown https://downloads.haskell.org/~ghc/8.6.2/ghc-8.6.2-i386-deb8-linux.tar.xz
ghc 8.6.2 x86_64 debian=8,debian,ubuntu https://downloads.haskell.org/~ghc/8.6.2/ghc-8.6.2-x86_64-deb8-linux.tar.xz
......@@ -56,6 +61,8 @@ ghc 8.6.3 x86_64 debian=9,debian,ubuntu https://downloads.haskell.or
ghc 8.6.3 x86_64 fedora=27,fedora,unknown https://downloads.haskell.org/~ghc/8.6.3/ghc-8.6.3-x86_64-fedora27-linux.tar.xz
ghc 8.6.3 x86_64 centos=7,centos,amazonlinux https://downloads.haskell.org/~ghc/8.6.3/ghc-8.6.3-x86_64-centos7-linux.tar.xz
ghc 8.6.3 x86_64 darwin https://downloads.haskell.org/~ghc/8.6.3/ghc-8.6.3-x86_64-apple-darwin.tar.xz
ghc 8.6.3 x86_64 freebsd=11 https://downloads.haskell.org/~ghc/8.6.3/ghc-8.6.3-x86_64-portbld-freebsd.tar.xz
cabal-install 2.2.0.0 i386 unknown https://downloads.haskell.org/~cabal/cabal-install-2.2.0.0/cabal-install-2.2.0.0-i386-unknown-linux.tar.gz
......@@ -66,7 +73,7 @@ cabal-install 2.4.0.0 x86_64 darwin https://downloads.haskell.or
cabal-install 2.4.0.0 x86_64 unknown https://downloads.haskell.org/~cabal/cabal-install-2.4.0.0/cabal-install-2.4.0.0-x86_64-unknown-linux.tar.gz
cabal-install 2.4.1.0 powerpc aix=7 https://downloads.haskell.org/cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-powerpc-ibm-aix7.1.0.0.tar.xz
cabal-install 2.4.1.0 x86_64 freebsd https://downloads.haskell.org/cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-x86_64-portbld-freebsd.tar.xz
cabal-install 2.4.1.0 x86_64 freebsd=11 https://downloads.haskell.org/cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-x86_64-portbld-freebsd.tar.xz
cabal-install 2.4.1.0 x86_64 darwin https://downloads.haskell.org/cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-x86_64-apple-darwin-sierra.tar.xz
cabal-install 2.4.1.0 x86_64 alpine https://downloads.haskell.org/cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-x86_64-alpine-linux-musl.tar.xz
cabal-install 2.4.1.0 i386 unknown https://downloads.haskell.org/cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-i386-unknown-linux.tar.xz
......
ghcup
+ 27
− 6
View file @ bbf63c38
......@@ -452,6 +452,27 @@ edo()
"$@" || exit 2
}
# @FUNCTION: emake
# @USAGE: [arguments]
# @DESCRIPTION:
# Wrapper around 'make', may call 'gmake' if it exists.
emake() { # avoid re-checking for gmake
if [ -n "${MAKE}" ] ; then
# shellcheck disable=SC2086
edo ${MAKE} "$@"
else
if command_exists gmake ; then
MAKE="gmake"
# shellcheck disable=SC2086
edo ${MAKE} "$@"
else
MAKE="make"
# shellcheck disable=SC2086
edo ${MAKE} "$@"
fi
fi
}
# @FUNCTION: debug_message
# @USAGE: <msg>
# @DESCRIPTION:
......@@ -628,9 +649,9 @@ get_distro_ver() {
printf "%s" "$(uname -v)"
;;
FreeBSD)
# we only care about the numeric version part left of
# the '-' in "11.2-RELEASE".
printf "%s" "$(uname -r | cut -d - -f 1)"
# we only care about the major numeric version part left of
# the '.' in "11.2-RELEASE".
printf "%s" "$(uname -r | cut -d . -f 1)"
;;
*)
# Fall back to uname, e.g. "Linux <version>", also works for BSD, etc.
......@@ -1188,7 +1209,7 @@ install_ghc() {
debug_message "Installing GHC into ${inst_location}"
edo ./configure --prefix="${inst_location}"
edo make install
emake install
# clean up
edo cd ..
......@@ -1544,8 +1565,8 @@ compile_ghc() {
edo ./boot
edo ./configure --prefix="${inst_location}" --with-ghc="${bootstrap_ghc}"
edo make -j${JOBS}
edo make install
emake -j${JOBS}
emake install
# clean up
edo cd ..
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment