Merge remote-tracking branch 'remotes/origin/merge-requests/117'

2019-12-16 15:01:39 +08:00 · 2019-12-16 15:01:39 +08:00 · b82146d346
commit b82146d346
parent b69ae29836 b2e0db9031
1 changed files with 5 additions and 1 deletions
--- a/6
+++ b/6
@ -1790,7 +1790,11 @@ compile_ghc() {


        edo ./boot
-        edo ./configure --prefix="${inst_location}" --with-ghc="${bootstrap_ghc}"
+        if echo "${myghcver}" | sed 's/[.]//g' | awk '{ exit ($0 < 881) ? 0 : 1 }' ; then
+            edo ./configure --prefix="${inst_location}" --with-ghc="${bootstrap_ghc}"
+        else
+            GHC=$(command -v "${bootstrap_ghc}") edo ./configure --prefix="${inst_location}"
+        fi
        emake -j${JOBS}
        emake install