Permalink
Browse files

Merge pull request #1674 from tuncer/fix-bootstrap.sh

Fix bootstrap.sh
  • Loading branch information...
2 parents 973723f + 11c5dd0 commit b0e5952f97eda6c853a70525084b1d8233c98242 @23Skidoo 23Skidoo committed Feb 8, 2014
Showing with 4 additions and 4 deletions.
  1. +4 −4 cabal-install/bootstrap.sh
@@ -28,13 +28,13 @@ DEFAULT_PREFIX="${HOME}/.cabal"
# Check for a C compiler.
[ ! -x "$CC" ] && for ccc in gcc clang cc icc; do
- ${CC} --version > /dev/null 2>&1 && CC=$ccc &&
- echo "Using $CC for C compiler. If this is not what you want, set $CC." >&2 &&
+ ${ccc} --version > /dev/null 2>&1 && CC=$ccc &&
+ echo "Using $CC for C compiler. If this is not what you want, set CC." >&2 &&
break
done
# None found.
-[ ! -x "$CC" ] &&
+[ ! -x `which "$CC"` ] &&
die "C compiler not found (or could not be run).
If a C compiler is installed make sure it is on your PATH,
or set the CC variable."
@@ -187,7 +187,7 @@ unpack_pkg () {
VER=$2
rm -rf "${PKG}-${VER}.tar" "${PKG}-${VER}"
- ${GZIP} -d < "${PKG}-${VER}.tar.gz" | ${TAR} -x -
+ ${GZIP} -d < "${PKG}-${VER}.tar.gz" | ${TAR} -x
[ -d "${PKG}-${VER}" ] || die "Failed to unpack ${PKG}-${VER}.tar.gz"
}

0 comments on commit b0e5952

Please sign in to comment.